yl

pom.xml

@@ -252,6 +252,14 @@
         </dependency>
 
 
+        <!-- 海康加密认证SDK -->
+        <dependency>
+            <groupId>com.hikvision.ga</groupId>
+            <artifactId>artemis-http-client</artifactId>
+            <version>1.1.3</version>
+        </dependency>
+
+
         <!--文件导入导出-->
         <dependency>
             <groupId>org.apache.poi</groupId>

src/main/java/com/yt/zhylplat/CodeGenerator.java

@@ -93,10 +93,10 @@ public class CodeGenerator {
        // pc.setModuleName(scanner("模块名"));
         pc.setParent("com.yt.zhylplat");
         pc.setMapper("dao");  //设置默认的mapper为dao
-        pc.setService("app.service");
-        pc.setServiceImpl("app.service.impl");
-        pc.setEntity("moduleZhjc.entity");
-        pc.setController("app.controller");
+   //     pc.setService("app.service");
+    //    pc.setServiceImpl("app.service.impl");
+        //pc.setEntity("moduleZhjc.entity");
+    //    pc.setController("app.controller");
     //    pc.setModuleName("moduleDabj");
         mpg.setPackageInfo(pc);
 

src/main/java/com/yt/zhylplat/api/request/TBaseDriveinfoRequest.java

@@ -267,6 +267,31 @@ public class TBaseDriveinfoRequest extends  BasePageRequest{
     @ApiModelProperty("F_WGS84X")
     private String fWgs84x;
 
+    @ApiModelProperty("F_Channel")
+    private Integer fChannel;
+
+    @ApiModelProperty("F_URL")
+    private String url;
+
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+
+    public Integer getfChannel()
+    {
+        return fChannel;
+    }
+
+    public void setfChannel(Integer fChannel) {
+        this.fChannel = fChannel;
+    }
+
     public Integer getfDriveid() {
         return fDriveid;
     }

src/main/java/com/yt/zhylplat/api/request/TBaseFacilityinfoRequest.java

@@ -259,8 +259,21 @@ public class TBaseFacilityinfoRequest extends  BasePageRequest{
     @TableField("environment")
     private String environment;
 
+    /**
+     * 到期时间
+     */
+    @ApiModelProperty(value = "到期时间")
+    @TableField("expiration_time")
+    private Date expirationTime;
 
 
+    /**
+     * 是否发送短信
+     */
+    @ApiModelProperty(value = "是否发送短信")
+    @TableField("is_sms")
+    private Integer isSms;
+
 
     /**
      * 字典名称1
@@ -274,6 +287,23 @@ public class TBaseFacilityinfoRequest extends  BasePageRequest{
     @TableField(exist = false)
     private String fStringname2;
 
+    public Date getExpirationTime() {
+        return expirationTime;
+    }
+
+    public void setExpirationTime(Date expirationTime) {
+        this.expirationTime = expirationTime;
+    }
+
+
+    public Integer getIsSms() {
+        return isSms;
+    }
+
+    public void setIsSms(Integer isSms) {
+        this.isSms = isSms;
+    }
+
     public String getfStringname4() {
         return fStringname4;
     }

src/main/java/com/yt/zhylplat/api/request/TSysModulefunctionsRequest.java

@@ -112,6 +112,7 @@ public class TSysModulefunctionsRequest extends BasePageRequest {
     @ApiModelProperty(value = "菜单来源（1：web，2：小程序）")
     private Integer source;
 
+
     @ApiModelProperty(value = "小程序模块类型（1：大模块，2：小模块，3：菜单，4：按钮）")
     private Integer appletType;
 

src/main/java/com/yt/zhylplat/api/request/TWoWorkorderbaseRequest.java

@@ -241,6 +241,13 @@ public class TWoWorkorderbaseRequest extends BasePageRequest{
 
     @ApiModelProperty(value = "推送时间")
     private String pushtime;
+
+
+    /**
+     * 抄送人
+     */
+    @ApiModelProperty(value = "抄送人")
+    private Integer cc;
     /**
      * 是否典型
      */
@@ -276,6 +283,10 @@ public class TWoWorkorderbaseRequest extends BasePageRequest{
     @ApiModelProperty(value = "父级id")
     private Integer parentid;
 
+
+    @ApiModelProperty("整改要求")
+    private  String rectification;
+
     @ApiModelProperty(value = "接收或者处置工单，1接收，2处置，3完结，4重新指派")
     private Integer acceptOrDispose;
 
@@ -322,6 +333,9 @@ public class TWoWorkorderbaseRequest extends BasePageRequest{
     @ApiModelProperty("weektype")
     private Integer weektype;
 
+    @ApiModelProperty("抄送人姓名")
+    private String ccName;
+
 
     /**
      * 工单大类对应经济运行平台监管要素编码
@@ -335,6 +349,22 @@ public class TWoWorkorderbaseRequest extends BasePageRequest{
     @TableField("patrol_id")
     private Integer patrolId;
 
+    public Integer getCc() {
+        return cc;
+    }
+
+    public void setCc(Integer cc) {
+        this.cc = cc;
+    }
+
+
+    public String getCcName() {
+        return ccName;
+    }
+    public void setCcName(String ccName) {
+        this.ccName = ccName;
+    }
+
     public Integer getfWorkorderid() {
         return fWorkorderid;
     }
@@ -1005,5 +1035,11 @@ public class TWoWorkorderbaseRequest extends BasePageRequest{
         this.parentid = parentid;
     }
 
+    public void setRectification(String rectification) {
+        this.rectification = rectification;
+    }
 
+    public String getRectification() {
+        return rectification;
+    }
 }

src/main/java/com/yt/zhylplat/api/response/TSysModulefunctionsResponse.java

@@ -91,6 +91,19 @@ public class TSysModulefunctionsResponse{
     @ApiModelProperty("F_SysFlag")
     private Boolean fSysflag;
 
+
+    @ApiModelProperty(value = "小程序模块类型（1：大模块，2：小模块，3：菜单，4：按钮）")
+    private Integer appletType;
+
+
+    public Integer getAppletType() {
+        return appletType;
+    }
+
+    public void setAppletType(Integer appletType) {
+        this.appletType = appletType;
+    }
+
     public String getRoute() {
         return route;
     }

src/main/java/com/yt/zhylplat/app/service/impl/ZhjcIrrigationBaseServiceImpl.java

@@ -9,6 +9,7 @@ import com.yt.zhylplat.base.ResultResponse;
 import com.yt.zhylplat.common.LoginUserUtil;
 import com.yt.zhylplat.enums.ResultCode;
 import com.yt.zhylplat.enums.ResultCodeEnum;
+import com.yt.zhylplat.moduleMap.entity.TMapPolygonGeometry;
 import com.yt.zhylplat.moduleMap.entity.TMapPolygonProperties;
 import com.yt.zhylplat.moduleMap.mapper.TMapPolygonPropertiesMapper;
 import com.yt.zhylplat.moduleZhjc.entity.ZhjcIrrigationBase;
@@ -22,10 +23,15 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -112,14 +118,51 @@ public class ZhjcIrrigationBaseServiceImpl extends ServiceImpl<ZhjcIrrigationBas
         List<ZhjcIrrigationEfficiency> Efficiency= baseMapper.selectEfficiency();
 
         List<ZhjcIrrigationConsumption>     Consumption= baseMapper.selectConsumption();
+        // 获取当前日期
+        LocalDate today = LocalDate.now();
+
+        // 设置为当天的0点
+        LocalTime startOfDay = LocalTime.MIDNIGHT;
+
+        // 将日期和时间组合成一个ZonedDateTime对象，使用系统默认时区
+        ZonedDateTime zonedDateTime = today.atTime(startOfDay).atZone(ZoneId.systemDefault());
+
+        // 定义日期时间的格式
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+        // 格式化输出为字符串
+        String formattedDateTime = zonedDateTime.format(formatter);
+
+        List<ZhjcIrrigationBase> irrigas=baseMapper.
+                selectList ( new QueryWrapper<ZhjcIrrigationBase>().lambda()
+                        .eq(ZhjcIrrigationBase::getParkId, id )
+                        .ge(ZhjcIrrigationBase::getStartTime,formattedDateTime));
 
 
         List<Map<String, Object>> effect=mapPolygonPropertiesMapper.
                 selectMaps( new QueryWrapper<TMapPolygonProperties>().lambda()
                 .eq(TMapPolygonProperties::getDelFlg, 0)
                         .eq(TMapPolygonProperties::getParkId, id )
-                .select(TMapPolygonProperties::getSurvive, TMapPolygonProperties::getIntact
+                .select( TMapPolygonProperties::getPolygonId, TMapPolygonProperties::getSectionName,
+                        TMapPolygonProperties::getSurvive, TMapPolygonProperties::getIntact
                         , TMapPolygonProperties::getComplaint));
+        for (Map<String, Object> map1 : effect) {
+
+            BigDecimal smartScope = irrigas.stream()
+                    .filter(x->x.getType()==1)
+                    .map(ZhjcIrrigationBase::getScope)
+                    .filter(Objects::nonNull)
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal manualScope = irrigas.stream()
+                    .filter(x->x.getType()==2)
+                    .map(ZhjcIrrigationBase::getScope)
+                    .filter(Objects::nonNull)
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+            map1.put("smartScope",smartScope);
+            map1.put("manualScope",manualScope);
+        }
+
+
         map.put("Efficiency",Efficiency);
         map.put("Consumption",Consumption);
         map.put("effect",effect);

src/main/java/com/yt/zhylplat/appController/SendMessageWxController.java

@@ -6,6 +6,7 @@ import com.yt.zhylplat.api.request.Template;
 import com.yt.zhylplat.api.request.TemplateParam;
 import com.yt.zhylplat.base.BaseConfiguration;
 import com.yt.zhylplat.base.ResultResponse;
+import com.yt.zhylplat.entity.TBaseFacilityinfo;
 import com.yt.zhylplat.entity.TWoWorkorderbase;
 import com.yt.zhylplat.enums.ResultCodeEnum;
 import com.yt.zhylplat.moduleAss.field.entity.TLhzxAssessTemplateField;
@@ -94,19 +95,34 @@ public class SendMessageWxController {
     }
 
     @GetMapping("/SendDiaryWarningMessage")
-    @ApiOperation("园长日记预警订阅消息推送")
+    @ApiOperation("派单提醒")
     public  static void SendDiaryWarningMessage(TWoWorkorderbase tWoWorkorderbase, String toUser,String title) {
+        String page = "pages/work_order_detail/work_order_detail?orderId=" +
+                tWoWorkorderbase.getfWorkorderid() + "&statusid=" + tWoWorkorderbase.getfStateid();
+        List<TemplateParam> templateParams = new ArrayList<>();
+        //事项编码
+        templateParams.add(TemplateParam.builder().key("character_string6").value(tWoWorkorderbase.getfFromcode()).build());
+        //事项名称
+        templateParams.add(TemplateParam.builder().key("thing19").value(tWoWorkorderbase.getfWorkordertype()).build());
+        //备注
+        templateParams.add(TemplateParam.builder().key("thing24").value(tWoWorkorderbase.getfContent()).build());
+        SendWX(templateParams,"zlr8Ce3V9yB3S--v6kNnp8W66a2fQO7uG-LTbPRwgdE", toUser, page);
+    }
 
-        String thing3 = "派单";
-        // 工单编号
-        String character_string = tWoWorkorderbase.getfFromcode();
-        String thing2 = title;//"园长日记未提交预警通知";
-        String thing9 = tWoWorkorderbase.getfContent();
-        if(thing9.length()>20){
-            thing9=thing9.substring(0,20);
+    @GetMapping("/SendDiaryWarningFacility")
+    @ApiOperation("设施到期提醒")
+    public  static void SendDiaryWarningFacility(TBaseFacilityinfo facilityinfo, String toUser, String title) {
+        String page = "packagePersonnel/pages/facilitiesFitness/facilitiesFitness" ;
+        List<TemplateParam> templateParams = new ArrayList<>();
+        templateParams.add(TemplateParam.builder().key("thing9").value(facilityinfo.getFName()).build());
+        templateParams.add(TemplateParam.builder().key("thing8").value("设备即将到期").build());
+        if (facilityinfo.getExpirationTime()!=null)
+        {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // 设置日期时间的格式
+            String dateString = sdf.format(facilityinfo.getExpirationTime()); // 将日期转换为字符串
+            templateParams.add(TemplateParam.builder().key("thing10").value(dateString).build());
         }
-        String page = "pages/work_order_detail/work_order_detail?orderId=" + tWoWorkorderbase.getfWorkorderid() + "&statusid=" + tWoWorkorderbase.getfStateid();
-        SendMessage(thing3, character_string, thing2, thing9, toUser, page);
+        SendWX(templateParams,"9k7_suAIzYn4zbC7hdOegpeNoWFpmOisq57Coh_ISrs", toUser, page);
     }
 
     @GetMapping("/sendAssessFieldMessage")
@@ -152,6 +168,18 @@ public class SendMessageWxController {
         subscribeMessage(template);
     }
 
+    public static void SendWX(List<TemplateParam> templateParams,
+                                   String templateId, String touser,String page) {
+
+        Template template = Template.builder()
+                .template_id(templateId)//模板 ID
+                .touser(touser)//用户 openid
+                .data(templateParams) //模板参数
+                .page(page)//点击消息跳转页面
+                .build();
+        subscribeMessage(template);
+    }
+
     /**
      * 发送会议提醒通知
      * @param thing1

src/main/java/com/yt/zhylplat/appController/TWoWorkorderbaseAppController.java

@@ -67,6 +67,12 @@ public class TWoWorkorderbaseAppController {
         return itWoWorkorderbaseService.saveWorkorderbase(baseRequest.getData());
     }
 
+    @PostMapping("/dispatchAppOrder")
+    @ApiOperation(value = "小程序派单", notes = "小程序派单")
+    @OperationLog(operDesc = "小程序派单")
+    public ResultResponse dispatchAppOrder(@RequestBody  BaseRequest<TWoWorkorderbaseRequest> baseRequest) throws ParseException {
+        return itWoWorkorderbaseService.dispatchAppOrder(baseRequest.getData());
+    }
 
     @PostMapping("/acceptOrDisposeWorkOrder")
     @ApiOperation(value = "小程序工单接收或处置", notes = "小程序工单接收或处置")

src/main/java/com/yt/zhylplat/appController/TodoMessageAppController.java

@@ -93,6 +93,7 @@ public class TodoMessageAppController {
                         .eq(TWoWorkorderbase::getfDeleteflag, 0)
 //                .eq(TWoWorkorderbase::getfWorkordertypeid, ts.getfWorkordertypeid())//工单类型
                         .ne(TWoWorkorderbase::getfStateid, 4)//工单状态不等于4
+                        .ne(TWoWorkorderbase::getfStateid, 3)//工单状态不等于4
                         .and(QueryWrapper -> QueryWrapper
                                 .in(collect.size() > 0, TWoWorkorderbase::getfWorkorderid, collect)
                         )
@@ -207,15 +208,29 @@ public class TodoMessageAppController {
             List<TWoWorkorderbase> list = workorderbaseService.list(new QueryWrapper<TWoWorkorderbase>().lambda()
                     .eq(TWoWorkorderbase::getfDeleteflag, 0)
                     .ne(TWoWorkorderbase::getfStateid, 4)//工单状态不等于4
-                    .in(baseRequest.getData().getDeptType() == 1, TWoWorkorderbase::getDeptType,0,1)//科室
-                    .eq(baseRequest.getData().getDeptType() != 1, TWoWorkorderbase::getDeptType,baseRequest.getData().getDeptType())//科室
-                    .exists("select distinct T_WO_WorkOrderTask.f_workorderid from T_WO_WorkOrderTask where f_ownerid=" + LoginUserUtil.getfUserid() + " and T_WO_WorkOrderTask.f_workorderid = T_WO_WorkOrderBase.f_workorderid and f_loseflag = 0"));
+                    .ne(TWoWorkorderbase::getfStateid, 3)//工单状态不等于4
+                    .in(baseRequest.getData().getDeptType() == 1,
+                            TWoWorkorderbase::getDeptType,0,1)//科室
+//                    .eq(baseRequest.getData().getDeptType() != 1,
+//                            TWoWorkorderbase::getDeptType,baseRequest.getData().getDeptType())//科室
+                    . and(wq ->
+                            wq. exists("select distinct T_WO_WorkOrderTask.f_workorderid from T_WO_WorkOrderTask where f_ownerid="
+                                    + LoginUserUtil.getfUserid()
+                                    + " and T_WO_WorkOrderTask.f_workorderid = T_WO_WorkOrderBase.f_workorderid and f_loseflag = 0")
+                                    .or()
+                                    .eq(TWoWorkorderbase::getfCreateid, LoginUserUtil.getfUserid())
+                    )
+                   );
 
             if (list.size() > 0) {
-                rcglCount = Math.toIntExact(list.stream().filter(workorderbase -> workorderbase.getfWorkordertypeid() == 3).count());
-                znfxCount = Math.toIntExact(list.stream().filter(workorderbase -> workorderbase.getfWorkordertypeid() == 4).count());
-                xftsCount = Math.toIntExact(list.stream().filter(workorderbase -> workorderbase.getfWorkordertypeid() == 5).count());
-                zxjcCount = Math.toIntExact(list.stream().filter(workorderbase -> workorderbase.getfWorkordertypeid() == 6).count());
+                rcglCount = Math.toIntExact(list.stream().filter(workorderbase ->
+                        workorderbase.getfWorkordertypeid() == 3).count());
+                znfxCount = Math.toIntExact(list.stream().filter(workorderbase ->
+                        workorderbase.getfWorkordertypeid() == 4).count());
+                xftsCount = Math.toIntExact(list.stream().filter(workorderbase ->
+                        workorderbase.getfWorkordertypeid() == 5).count());
+                zxjcCount = Math.toIntExact(list.stream().filter(workorderbase ->
+                        workorderbase.getfWorkordertypeid() == 6).count());
             }
         }
         map.put("rcglCount",rcglCount);

src/main/java/com/yt/zhylplat/controller/TBaseDriveinfoController.java

@@ -171,6 +171,13 @@ public class TBaseDriveinfoController {
     public ResultResponse saveDriveInfo(@RequestBody BaseRequest<TBaseDriveinfoRequest> baseRequest) {
         return itBaseDriveinfoService.saveDriveInfo(baseRequest.getData());
     }
+    @PostMapping("/updateDriveInfo")
+    @ApiOperation(value = "web更新方法", notes = "web更新方法")
+    @OperationLog(operDesc = "web更新方法")
+    public ResultResponse updateDriveInfo(@RequestBody BaseRequest<TBaseDriveinfoRequest> baseRequest) {
+        return itBaseDriveinfoService.updateDriveInfo(baseRequest.getData());
+    }
+
     @PostMapping("/deleteDriveInfo")
     @ApiOperation(value = "web分类删除方法", notes = "web分类删除方法")
     @OperationLog(operDesc = "web分类删除方法")
@@ -202,6 +209,12 @@ public class TBaseDriveinfoController {
     {
         return itBaseDriveinfoService.selectDriveinfoList(id);
     }
-
+    @GetMapping("/GetUrl/{id}")
+    @ApiOperation(value = "大屏获取通道", notes = "大屏获取通道")
+    @OperationLog(operDesc = "大屏获取通道")
+    public ResultResponse GetUrl(@PathVariable int id)
+    {
+        return itBaseDriveinfoService.GetUrl(id);
+    }
 
 }

src/main/java/com/yt/zhylplat/controller/TEquipmentMaintenanceController.java

@@ -3,10 +3,12 @@ package com.yt.zhylplat.controller;
 
 import com.yt.zhylplat.annotation.OperationLog;
 import com.yt.zhylplat.api.request.BaseRequest;
+import com.yt.zhylplat.api.request.TBaseDriveinfoRequest;
 import com.yt.zhylplat.api.request.TBaseFacilityinfoRequest;
 import com.yt.zhylplat.base.ResultResponse;
 import com.yt.zhylplat.entity.TEquipmentMaintenance;
 import com.yt.zhylplat.entity.TEquipmentMaintenanceRequest;
+import com.yt.zhylplat.enums.ResultCodeEnum;
 import com.yt.zhylplat.moduleMap.entity.TMapPolygonProperties;
 import com.yt.zhylplat.service.ITBaseFacilityinfoService;
 import com.yt.zhylplat.service.TEquipmentMaintenanceService;
@@ -39,14 +41,17 @@ public class TEquipmentMaintenanceController {
     }
     @ApiOperation("新增")
     @PostMapping("/")
-    public Boolean add(@RequestBody TEquipmentMaintenance baseRequest) {
-        return equipmentMaintenanceService.saveMaintenanceinfo(baseRequest);
+    public ResultResponse add(@RequestBody BaseRequest<TEquipmentMaintenanceRequest> baseRequest ) {
+        equipmentMaintenanceService.saveMaintenanceinfo(baseRequest.getData());
+        return  ResultResponse.builder().status(ResultCodeEnum.SUCCESS.getCode()).message(ResultCodeEnum.SUCCESS.getMessage()).build();
+
     }
 
     @ApiOperation("修改")
     @PutMapping("/")
-    public Boolean modify(@RequestBody TEquipmentMaintenance baseRequest) {
-        return equipmentMaintenanceService.modify(baseRequest);
+    public ResultResponse modify(@RequestBody TEquipmentMaintenance baseRequest ) {
+           equipmentMaintenanceService.modify(baseRequest);
+        return  ResultResponse.builder().status(ResultCodeEnum.SUCCESS.getCode()).message(ResultCodeEnum.SUCCESS.getMessage()).build();
     }
     @ApiOperation("删除(单个条目)")
     @DeleteMapping(value = "/{id}")

src/main/java/com/yt/zhylplat/controller/TWoWorkorderbaseController.java

@@ -10,6 +10,7 @@ import com.yt.zhylplat.api.request.BaseRequest;
 import com.yt.zhylplat.api.request.StatusUpdate;
 import com.yt.zhylplat.api.request.TWoWorkorderbaseRequest;
 import com.yt.zhylplat.base.ResultResponse;
+import com.yt.zhylplat.common.LoginUserUtil;
 import com.yt.zhylplat.config.pkx.comn.ORpose;
 import com.yt.zhylplat.dao.TBaseYhcompanyMapper;
 import com.yt.zhylplat.dao.TWoWorkorderteamdealinfoMapper;
@@ -262,8 +263,17 @@ public class TWoWorkorderbaseController {
             Date calendar3 = new java.sql.Timestamp(sdf.parse(date3).getTime());
            ts.setfRemainderstarttime(calendar3);
             }
-            ts.setfStateid(2);
-            ts.setfState("派单");
+//            ts.setfStateid(2);
+//            ts.setfState("派单");
+            ts.setfStateid(3);
+            ts.setfState("处理中");
+            ts.setCheckdept(ts.getfYhdeptname());
+            ts.setChecktime(new Date());
+            ts.setCheckusername(LoginUserUtil.getfUsername());
+            ts.setfDealres("");
+            ts.setCheckresult("1");
+            ts.setDisposeresultdesc("处理中");
+
             return itWoWorkorderbaseService.insert(ts);
         }
     }
@@ -371,10 +381,14 @@ public class TWoWorkorderbaseController {
         int SPHJcount = 0;
         int WLWJcount = 0;
         int WLHJcount = 0;
-         SPHJcount = tWoWorkorderbaseslist.stream().filter(t -> t.getfFromref().equals("视频捕捉")).collect(Collectors.toList()).size();
-        SPWJcount = tWoWorkorderbaseslist.stream().filter(t -> t.getfFromref().equals("视频捕捉") && t.getfStateid().equals(4)).collect(Collectors.toList()).size();
-        WLHJcount = tWoWorkorderbaseslist.stream().filter(t -> t.getfFromref().equals("物联感知")).collect(Collectors.toList()).size();
-        WLWJcount = tWoWorkorderbaseslist.stream().filter(t -> t.getfFromref().equals("物联感知") && t.getfStateid().equals(4)).collect(Collectors.toList()).size();
+         SPHJcount = tWoWorkorderbaseslist.stream().filter(t -> t.getfFromref().
+                 equals("视频捕捉")).collect(Collectors.toList()).size();
+        SPWJcount = tWoWorkorderbaseslist.stream().filter(t -> t.getfFromref().
+                equals("视频捕捉") && t.getfStateid().equals(4)).collect(Collectors.toList()).size();
+        WLHJcount = tWoWorkorderbaseslist.stream().filter(t -> t.getfFromref()
+                .equals("物联感知")).collect(Collectors.toList()).size();
+        WLWJcount = tWoWorkorderbaseslist.stream().filter(t -> t.getfFromref().
+                equals("物联感知") && t.getfStateid().equals(4)).collect(Collectors.toList()).size();
 
         map.put("SPHJcount", SPHJcount);
         map.put("SPWJcount", SPWJcount);

src/main/java/com/yt/zhylplat/controller/TWorkReportController.java

@@ -0,0 +1,67 @@
+package com.yt.zhylplat.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yt.zhylplat.annotation.OperationLog;
+import com.yt.zhylplat.app.service.AppTrjcBaseService;
+import com.yt.zhylplat.base.ResultResponse;
+import com.yt.zhylplat.entity.TWorkReport;
+import com.yt.zhylplat.moduleZhjc.entity.ZhjcTrjcBase;
+import com.yt.zhylplat.service.TWorkReportService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author YTKJ
+ * @since 2025-11-17
+ */
+@Api(tags = {"日周月报"})
+@CrossOrigin
+@RestController
+@RequestMapping("/t-work-report")
+public class TWorkReportController {
+
+    @Autowired
+    TWorkReportService workReportService;
+
+    @PostMapping("/saveWorkReportBase")
+    @ApiOperation(value = "日周月报新增方法", notes = "日周月报新增方法")
+    @OperationLog(operDesc = "日周月报新增方法")
+    public ResultResponse saveWorkReportBase(@RequestBody TWorkReport baseRequest) {
+        return workReportService.saveTWorkReport(baseRequest);
+    }
+
+    @PutMapping("/updateWorkReportBase")
+    @ApiOperation(value = "日周月报修改方法", notes = "日周月报修改方法")
+    @OperationLog(operDesc = "日周月报修改方法")
+    public ResultResponse updateWorkReportBase(@RequestBody TWorkReport baseRequest) {
+        return workReportService.updateTWorkReport(baseRequest);
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "日周月报删除方法", notes = "日周月报删除方法")
+    @OperationLog(operDesc = "日周月报删除方法")
+    public ResultResponse deleteWorkReportBase(@PathVariable Integer id) {
+        return workReportService.deleteTWorkReport(id);
+    }
+
+    @ApiOperation("根据ID查询日周月报信息")
+    @GetMapping(value = "/{id}")
+    public ResultResponse selectById(@PathVariable("id") Integer id) {
+        return workReportService.selectById(id);
+    }
+
+
+    @ApiOperation("分页列表")
+    @GetMapping("/page")
+    public ResultResponse page(Page page, TWorkReport zhjcTrjcBase) {
+        return workReportService.pageList(page,zhjcTrjcBase);
+    }
+
+}

src/main/java/com/yt/zhylplat/dao/TWorkReportMapper.java

@@ -0,0 +1,16 @@
+package com.yt.zhylplat.dao;
+
+import com.yt.zhylplat.entity.TWorkReport;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author YTKJ
+ * @since 2025-11-17
+ */
+public interface TWorkReportMapper extends BaseMapper<TWorkReport> {
+
+}

src/main/java/com/yt/zhylplat/entity/TBaseDriveinfo.java

@@ -12,6 +12,7 @@ package com.yt.zhylplat.entity;
     import lombok.Data;
     import lombok.EqualsAndHashCode;
     import lombok.experimental.Accessors;
+    import org.bouncycastle.pqc.crypto.newhope.NHOtherInfoGenerator;
 
 /**
 * <p>
@@ -272,6 +273,30 @@ package com.yt.zhylplat.entity;
         @TableField("F_WGS84X")
     private String fWgs84x;
 
+    @TableField("F_Channel")
+    private Integer fChannel;
+
+    @TableField("F_URL")
+    private String url;
+
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public Integer getfChannel()
+    {
+        return fChannel;
+    }
+
+    public void setfChannel(Integer fChannel) {
+        this.fChannel = fChannel;
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }

src/main/java/com/yt/zhylplat/entity/TBaseFacilityinfo.java

@@ -196,4 +196,20 @@ public class TBaseFacilityinfo implements Serializable {
     @ApiModelProperty(value = "环境数据")
     @TableField("environment")
     private String environment;
+
+    /**
+     * 到期时间
+     */
+    @ApiModelProperty(value = "到期时间")
+    @TableField("expiration_time")
+    private Date expirationTime;
+
+
+    /**
+     * 是否发送短信
+     */
+    @ApiModelProperty(value = "是否发送短信")
+    @TableField("is_sms")
+    private Integer isSms;
+
 }

src/main/java/com/yt/zhylplat/entity/TBaseParkinfo.java

@@ -325,6 +325,51 @@ public class TBaseParkinfo implements Serializable {
     @TableField("flag2")
     private Integer flag2;
 
+    @ApiModelProperty(value = "信用评分")
+    @TableField("credit_score")
+    private Integer creditScore;
+    @ApiModelProperty(value = "信用等级")
+    @TableField("credit_level")
+    private String creditLevel;
+    @ApiModelProperty(value = "风险评分")
+    @TableField("risk_score")
+    private Integer riskScore;
+    @ApiModelProperty(value = "风险等级")
+    @TableField("risk_level")
+    private String riskLevel;
+
+    public Integer getCreditScore() {
+        return creditScore;
+    }
+
+    public void setCreditScore(Integer creditScore) {
+        this.creditScore = creditScore;
+    }
+
+    public String getCreditLevel() {
+        return creditLevel;
+    }
+
+    public void setCreditLevel(String creditLevel) {
+        this.creditLevel = creditLevel;
+    }
+
+    public Integer getRiskScore() {
+        return riskScore;
+    }
+
+    public void setRiskScore(Integer riskScore) {
+        this.riskScore = riskScore;
+    }
+
+    public String getRiskLevel() {
+        return riskLevel;
+    }
+
+    public void setRiskLevel(String riskLevel) {
+        this.riskLevel = riskLevel;
+    }
+
 
     /**
      * 公园顶图片

src/main/java/com/yt/zhylplat/entity/TEquipmentMaintenance.java

@@ -1,6 +1,9 @@
 package com.yt.zhylplat.entity;
 
     import java.math.BigDecimal;
+
+    import com.baomidou.mybatisplus.annotation.IdType;
+    import com.baomidou.mybatisplus.annotation.TableId;
     import com.baomidou.mybatisplus.annotation.TableName;
     import java.util.Date;
     import java.time.LocalDateTime;
@@ -31,6 +34,12 @@ package com.yt.zhylplat.entity;
 
     private static final long serialVersionUID = 1L;
 
+
+    @ApiModelProperty(value = "id")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
             @ApiModelProperty(value = "设备编号")
         @TableField("equipment_id")
     private Integer equipmentId;

src/main/java/com/yt/zhylplat/entity/TEquipmentMaintenanceRequest.java

@@ -1,6 +1,8 @@
 package com.yt.zhylplat.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yt.zhylplat.api.request.BasePageRequest;
 import io.swagger.annotations.ApiModel;
@@ -28,7 +30,9 @@ import java.util.Date;
 public class TEquipmentMaintenanceRequest extends BasePageRequest {
 
     private static final long serialVersionUID = 1L;
-
+    @ApiModelProperty(value = "id")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
     @ApiModelProperty(value = "设备编号")
     @TableField("equipment_id")
     private Integer equipmentId;
@@ -83,11 +87,11 @@ public class TEquipmentMaintenanceRequest extends BasePageRequest {
 
     @ApiModelProperty(value = "创建时间")
     @TableField("created_at")
-    private LocalDateTime createdAt;
+    private Date createdAt;
 
     @ApiModelProperty(value = "更新时间")
     @TableField("updated_at")
-    private LocalDateTime updatedAt;
+    private Date updatedAt;
 
     @ApiModelProperty(value = "公园id")
     @TableField("park_id")

src/main/java/com/yt/zhylplat/entity/TWoWorkorderbase.java

@@ -410,12 +410,28 @@ public class TWoWorkorderbase implements Serializable {
 
 
     /**
+     * 抄送人
+     */
+    @TableField("cc")
+    private Integer cc;
+
+    @TableField("cc_name")
+    private String ccName;
+
+    /**
      * 是否典型
      */
     @TableField("F_Typical")
     private  Integer fTypical;
 
     /**
+     * 整改要求
+     */
+    @TableField("rectification")
+    private  String rectification;
+
+
+    /**
      * 施工单位名称
      */
     @TableField("F_SGDeptName")
@@ -568,6 +584,21 @@ public class TWoWorkorderbase implements Serializable {
         this.fRiskLevel = fRiskLevel;
     }
 
+    public Integer getCc() {
+        return cc;
+    }
+
+    public void setCc(Integer cc) {
+        this.cc = cc;
+    }
+
+
+    public String getCcName() {
+        return ccName;
+    }
+    public void setCcName(String ccName) {
+        this.ccName = ccName;
+    }
 
     public Date getPushtime() {
         return pushtime;
@@ -1259,4 +1290,14 @@ public class TWoWorkorderbase implements Serializable {
     public void setSynctimeCypt(Date synctimeCypt) {
         this.synctimeCypt = synctimeCypt;
     }
+
+
+    public void setRectification(String rectification) {
+        this.rectification = rectification;
+    }
+
+    public String getRectification() {
+        return rectification;
+    }
+
 }

src/main/java/com/yt/zhylplat/entity/TWorkReport.java

@@ -0,0 +1,82 @@
+package com.yt.zhylplat.entity;
+
+    import com.baomidou.mybatisplus.annotation.IdType;
+    import com.baomidou.mybatisplus.annotation.TableId;
+    import com.baomidou.mybatisplus.annotation.TableName;
+    import java.util.Date;
+    import com.baomidou.mybatisplus.annotation.TableField;
+    import java.io.Serializable;
+    import io.swagger.annotations.ApiModel;
+    import io.swagger.annotations.ApiModelProperty;
+    import lombok.Data;
+    import lombok.EqualsAndHashCode;
+    import lombok.experimental.Accessors;
+
+/**
+* <p>
+    * 
+    * </p>
+*
+* @author YTKJ
+* @since 2025-11-17
+*/
+    @Data
+        @EqualsAndHashCode(callSuper = false)
+    @Accessors(chain = true)
+    @TableName("T_Work_Report")
+    @ApiModel(value="TWorkReport对象", description="")
+    public class TWorkReport implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "自增id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+            @ApiModelProperty(value = "类型1日2周3月")
+        @TableField("type")
+    private Integer type;
+
+            @ApiModelProperty(value = "管养班组")
+        @TableField("team")
+    private String team;
+
+            @ApiModelProperty(value = "人数")
+        @TableField("number")
+    private Integer number;
+
+            @ApiModelProperty(value = "负责人")
+        @TableField("superintendent")
+    private String superintendent;
+
+            @ApiModelProperty(value = "工作开始时间")
+        @TableField("work_start_time")
+    private Date workStartTime;
+
+            @ApiModelProperty(value = "工作结束时间")
+        @TableField("work_end_time")
+    private Date workEndTime;
+
+            @ApiModelProperty(value = "工作内容")
+        @TableField("work_content")
+    private String workContent;
+
+            @ApiModelProperty(value = "未完成工作")
+        @TableField("unfinished_work")
+    private String unfinishedWork;
+
+            @ApiModelProperty(value = "创建时间")
+        @TableField("create_time")
+    private Date createTime;
+
+            @ApiModelProperty(value = "更新时间")
+        @TableField("update_time")
+    private Date updateTime;
+
+            @ApiModelProperty(value = "添加人")
+        @TableField("create_user")
+    private String createUser;
+
+
+}

src/main/java/com/yt/zhylplat/moduleGygy/controller/GygyScheduleController.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yt.zhylplat.appController.SendMessageWxController;
 import com.yt.zhylplat.base.Assert;
 import com.yt.zhylplat.common.GenerateCode;
+import com.yt.zhylplat.common.LoginUserUtil;
 import com.yt.zhylplat.dao.TSysUseraccountMapper;
 import com.yt.zhylplat.dao.TWoWorkorderbaseMapper;
 import com.yt.zhylplat.entity.*;
@@ -178,8 +179,16 @@ public class GygyScheduleController {
                 String phone = "";
 
                 TWoWorkorderbase tWoWorkorderbase = new TWoWorkorderbase();
-                tWoWorkorderbase.setfStateid(2);
-                tWoWorkorderbase.setfState("派单");
+//                tWoWorkorderbase.setfStateid(2);
+//                tWoWorkorderbase.setfState("派单");
+                tWoWorkorderbase.setfStateid(3);
+                tWoWorkorderbase.setfState("处理中");
+                tWoWorkorderbase.setCheckdept(tWoWorkorderbase.getfYhdeptname());
+                tWoWorkorderbase.setChecktime(new Date());
+                tWoWorkorderbase.setCheckusername(LoginUserUtil.getfUsername());
+                tWoWorkorderbase.setfDealres("");
+                tWoWorkorderbase.setCheckresult("1");
+                tWoWorkorderbase.setDisposeresultdesc("处理中");
                 tWoWorkorderbase.setfWorkordertypeid(4);
                 tWoWorkorderbase.setfWorkordertype("智能发现");
                 tWoWorkorderbase.setfCustomername("智能发现");
@@ -524,8 +533,16 @@ public class GygyScheduleController {
                 String phone = "";
 
                 TWoWorkorderbase tWoWorkorderbase = new TWoWorkorderbase();
-                tWoWorkorderbase.setfStateid(2);
-                tWoWorkorderbase.setfState("派单");
+//                tWoWorkorderbase.setfStateid(2);
+//                tWoWorkorderbase.setfState("派单");
+                tWoWorkorderbase.setfStateid(3);
+                tWoWorkorderbase.setfState("处理中");
+                tWoWorkorderbase.setCheckdept(tWoWorkorderbase.getfYhdeptname());
+                tWoWorkorderbase.setChecktime(new Date());
+                tWoWorkorderbase.setCheckusername(LoginUserUtil.getfUsername());
+                tWoWorkorderbase.setfDealres("");
+                tWoWorkorderbase.setCheckresult("1");
+                tWoWorkorderbase.setDisposeresultdesc("处理中");
                 tWoWorkorderbase.setfWorkordertypeid(4);
                 tWoWorkorderbase.setfWorkordertype("智能发现");
                 tWoWorkorderbase.setfCustomername("智能发现");
@@ -752,8 +769,16 @@ public class GygyScheduleController {
                 String phone = "";
 
                 TWoWorkorderbase tWoWorkorderbase = new TWoWorkorderbase();
-                tWoWorkorderbase.setfStateid(2);
-                tWoWorkorderbase.setfState("派单");
+//                tWoWorkorderbase.setfStateid(2);
+//                tWoWorkorderbase.setfState("派单");
+                tWoWorkorderbase.setfStateid(3);
+                tWoWorkorderbase.setfState("处理中");
+                tWoWorkorderbase.setCheckdept(tWoWorkorderbase.getfYhdeptname());
+                tWoWorkorderbase.setChecktime(new Date());
+                tWoWorkorderbase.setCheckusername(LoginUserUtil.getfUsername());
+                tWoWorkorderbase.setfDealres("");
+                tWoWorkorderbase.setCheckresult("1");
+                tWoWorkorderbase.setDisposeresultdesc("处理中");
                 tWoWorkorderbase.setfWorkordertypeid(4);
                 tWoWorkorderbase.setfWorkordertype("智能发现");
                 tWoWorkorderbase.setfCustomername("智能发现");
@@ -996,8 +1021,16 @@ public class GygyScheduleController {
         }
         //创建工单
         TWoWorkorderbase tWoWorkorderbase = new TWoWorkorderbase();
-        tWoWorkorderbase.setfStateid(2);
-        tWoWorkorderbase.setfState("派单");
+//        tWoWorkorderbase.setfStateid(2);
+//        tWoWorkorderbase.setfState("派单");
+        tWoWorkorderbase.setfStateid(3);
+        tWoWorkorderbase.setfState("处理中");
+        tWoWorkorderbase.setCheckdept(tWoWorkorderbase.getfYhdeptname());
+        tWoWorkorderbase.setChecktime(new Date());
+        tWoWorkorderbase.setCheckusername(LoginUserUtil.getfUsername());
+        tWoWorkorderbase.setfDealres("");
+        tWoWorkorderbase.setCheckresult("1");
+        tWoWorkorderbase.setDisposeresultdesc("处理中");
         tWoWorkorderbase.setfWorkordertypeid(4);
         tWoWorkorderbase.setfWorkordertype("智能发现");
         tWoWorkorderbase.setfCustomername("智能发现");

src/main/java/com/yt/zhylplat/moduleLhgy/controller/LhgyWorkOrderBaseAppController.java

@@ -79,6 +79,13 @@ public class LhgyWorkOrderBaseAppController {
         return workorderbaseService.savePatrolTrack(baseRequest.getData());
     }
 
+    @PostMapping("/patrolTrackIsSpeeding")
+    @ApiOperation(value = "绿化科小程序生成巡查记录", notes = "绿化科小程序生成巡查记录")
+    @OperationLog(operDesc = "绿化科小程序生成巡查记录")
+    public ResultResponse patrolTrackIsSpeeding(@RequestBody BaseRequest<TLhgyPatrolTrackRequest> baseRequest) {
+        return workorderbaseService.savePatrolTrack(baseRequest.getData());
+    }
+
     @PostMapping("/savePatrolTrackFile")
     @ApiOperation(value = "绿化科小程序巡视巡查问题上传", notes = "绿化科小程序巡视巡查问题上传")
     @OperationLog(operDesc = "绿化科小程序巡视巡查问题上传")
@@ -94,6 +101,7 @@ public class LhgyWorkOrderBaseAppController {
     }
 
 
+
     @PostMapping("/selectPatrolTrackByPage")
     @ApiOperation(value = "绿化科小程序查询巡视巡查", notes = "绿化科小程序查询巡视巡查")
     @OperationLog(operDesc = "绿化科小程序查询巡视巡查")

src/main/java/com/yt/zhylplat/moduleLhgy/service/impl/LhgyWorkOrderBaseServiceImpl.java

@@ -1233,6 +1233,10 @@ public class LhgyWorkOrderBaseServiceImpl extends ServiceImpl<TWoWorkorderbaseMa
     }
 
 
+
+
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResultResponse savePatrolTrack(TLhgyPatrolTrackRequest requestData) {
@@ -1643,17 +1647,17 @@ public class LhgyWorkOrderBaseServiceImpl extends ServiceImpl<TWoWorkorderbaseMa
         tWoWorkorderbase.setfCode(GenerateCode.generateNo("gyykljc"));//工单编号
         tWoWorkorderbase.setPushtime(tWoWorkorderbase.getfCreatedate());
         tWoWorkorderbase.setfFromcode(GenerateCode.generateWorkFromCode());
-        tWoWorkorderbase.setfStateid(2);
-        tWoWorkorderbase.setfState("派单");
+        tWoWorkorderbase.setfStateid(1);
+        tWoWorkorderbase.setfState("日常");
         tWoWorkorderbase.setfFromtype("巡视巡查");
         tWoWorkorderbase.setfCategoryid1(27);
         tWoWorkorderbase.setfCategoryname1("巡视巡查");
         tWoWorkorderbase.setfFromref("移动巡查");
 
-        TBaseYhcompany yhcompany = null;
+     //   TBaseYhcompany yhcompany = null;
         String phone = "";
 
-        List<TSysUseraccount> sysUseraccounts = new ArrayList<>();
+     //   List<TSysUseraccount> sysUseraccounts = new ArrayList<>();
 
         // 巡查单
         TLhgyPatrolTrack patrolTrack = null;
@@ -1661,74 +1665,75 @@ public class LhgyWorkOrderBaseServiceImpl extends ServiceImpl<TWoWorkorderbaseMa
         TLhzxMaintenanceCompany maintenanceCompany = null;
         // 标段信息
         TLhzxSection section = null;
-        Integer sectionId = null;
-        String sectionName = "";
+//        Integer sectionId = null;
+//        String sectionName = "";
         // 根据巡查单id查询巡查单 区级
-        if (tPestcPatrolTrackIssue.getIssueType() == 2){
-            // 巡查单
-            patrolTrack = patrolTrackMapper.selectById(tPestcPatrolTrackIssue.getPatrolId());
-
-            Assert.assertTrue(patrolTrack.getNumber3() == null, "当前巡视巡查未选择养护单位");
-
-            yhcompany = yhcompanyMapper.selectById(patrolTrack.getNumber3());
-            Assert.assertTrue(yhcompany == null, "工单对应养护单位id无法查询到养护单位信息");
-
-            //根据养护单位ID + 标段ID 获取到项目经理
-            List<TLhgySectionCompany> sectionCompanyList = sectionCompanyMapper.selectList(new QueryWrapper<TLhgySectionCompany>().lambda()
-                    .eq(TLhgySectionCompany::getYhCompanyId, yhcompany.getfYhcompanyid())
-                    .eq(TLhgySectionCompany::getSectionId, patrolTrack.getObjectId()));
-            Assert.assertTrue(sectionCompanyList.size() == 0, "当前巡查标段对应的养护单位下未维护项目经理对应关系");
-
-            List<Integer> userIds = sectionCompanyList.stream().map(TLhgySectionCompany::getUserId).distinct().collect(Collectors.toList());
-            //养护单位账号
-            sysUseraccounts = tSysUseraccountMapper.selectList(new QueryWrapper<TSysUseraccount>().lambda()
-                    .in(TSysUseraccount::getfUserid, userIds)
-                    .eq(TSysUseraccount::getfDeleteflag, 0));
-            Assert.assertTrue(sysUseraccounts.size() == 0, "当前养护单位无法查询到项目经理账户信息");
-
-            sectionId = patrolTrack.getObjectId();
-            sectionName = patrolTrack.getObjectName();
-        }// 市级
-        else if (tPestcPatrolTrackIssue.getIssueType() == 1){
-            // pestcPatrolTrack = pestcPatrolTrackService.selectById(tPestcPatrolTrackIssue.getPatrolId());
-            Assert.assertTrue(tPestcPatrolTrackIssue.getSectionId() == null, "请选择选择标段");
-            Assert.assertTrue(tPestcPatrolTrackIssue.getMaintenanceCompanyId() == null, "请选择选择养护单位");
-            // 查询养护公司信息
-            maintenanceCompany = maintenanceCompanyService.selectById(tPestcPatrolTrackIssue.getMaintenanceCompanyId());
-            Assert.assertTrue(maintenanceCompany == null, "工单对应养护单位id无法查询到养护单位信息");
-            yhcompany = yhcompanyMapper.selectById(maintenanceCompany.getOldMaintenanceCompanyId());
-            // 标段信息
-            section = sectionService.selectById(tPestcPatrolTrackIssue.getSectionId());
-            Assert.assertTrue(section == null, "工单对应标段id无法查询到标段信息");
-
-            //根据养护单位ID + 标段ID 获取到项目经理
-            List<TLhgySectionCompany> sectionCompanyList = sectionCompanyMapper.selectList(new QueryWrapper<TLhgySectionCompany>().lambda()
-                    .eq(TLhgySectionCompany::getYhCompanyId, maintenanceCompany.getOldMaintenanceCompanyId())
-                    .eq(TLhgySectionCompany::getSectionId, section.getOldSectionId()));
-            Assert.assertTrue(sectionCompanyList.size() == 0, "当前巡查标段对应的养护单位下未维护项目经理对应关系");
-
-            List<Integer> userIds = sectionCompanyList.stream().map(TLhgySectionCompany::getUserId).distinct().collect(Collectors.toList());
-            //养护单位账号
-            sysUseraccounts = tSysUseraccountMapper.selectList(new QueryWrapper<TSysUseraccount>().lambda()
-                    .in(TSysUseraccount::getfUserid, userIds)
-                    .eq(TSysUseraccount::getfDeleteflag, 0));
-            Assert.assertTrue(sysUseraccounts.size() == 0, "当前养护单位无法查询到项目经理账户信息");
-
-            sectionId = section.getOldSectionId();
-            sectionName = section.getSectionName();
-        } else {
-            return -1;
-        }
-
-        tWoWorkorderbase.setfGlsx(yhcompany.getfGlsx());
-        tWoWorkorderbase.setfGlsy(yhcompany.getfGlsy());
-        tWoWorkorderbase.setfYhuserid(sysUseraccounts.get(0).getfUserid());
-        tWoWorkorderbase.setfYhusername(sysUseraccounts.get(0).getfUsername());
-        tWoWorkorderbase.setfYhdeptid(yhcompany.getfYhcompanyid());
-        tWoWorkorderbase.setfYhdeptname(yhcompany.getfDeptname());
-        tWoWorkorderbase.setfRegionname(yhcompany.getfAddress());
-        tWoWorkorderbase.setfSguserid(sectionId);
-        tWoWorkorderbase.setfSgusername(sectionName);
+        patrolTrack = patrolTrackMapper.selectById(tPestcPatrolTrackIssue.getPatrolId());
+//        if (tPestcPatrolTrackIssue.getIssueType() == 2){
+//            // 巡查单
+//            patrolTrack = patrolTrackMapper.selectById(tPestcPatrolTrackIssue.getPatrolId());
+//
+//            Assert.assertTrue(patrolTrack.getNumber3() == null, "当前巡视巡查未选择养护单位");
+//
+//            yhcompany = yhcompanyMapper.selectById(patrolTrack.getNumber3());
+//            Assert.assertTrue(yhcompany == null, "工单对应养护单位id无法查询到养护单位信息");
+//
+//            //根据养护单位ID + 标段ID 获取到项目经理
+//            List<TLhgySectionCompany> sectionCompanyList = sectionCompanyMapper.selectList(new QueryWrapper<TLhgySectionCompany>().lambda()
+//                    .eq(TLhgySectionCompany::getYhCompanyId, yhcompany.getfYhcompanyid())
+//                    .eq(TLhgySectionCompany::getSectionId, patrolTrack.getObjectId()));
+//            Assert.assertTrue(sectionCompanyList.size() == 0, "当前巡查标段对应的养护单位下未维护项目经理对应关系");
+//
+//            List<Integer> userIds = sectionCompanyList.stream().map(TLhgySectionCompany::getUserId).distinct().collect(Collectors.toList());
+//            //养护单位账号
+//            sysUseraccounts = tSysUseraccountMapper.selectList(new QueryWrapper<TSysUseraccount>().lambda()
+//                    .in(TSysUseraccount::getfUserid, userIds)
+//                    .eq(TSysUseraccount::getfDeleteflag, 0));
+//            Assert.assertTrue(sysUseraccounts.size() == 0, "当前养护单位无法查询到项目经理账户信息");
+//
+//            sectionId = patrolTrack.getObjectId();
+//            sectionName = patrolTrack.getObjectName();
+//        }// 市级
+//        else if (tPestcPatrolTrackIssue.getIssueType() == 1){
+//            // pestcPatrolTrack = pestcPatrolTrackService.selectById(tPestcPatrolTrackIssue.getPatrolId());
+//            Assert.assertTrue(tPestcPatrolTrackIssue.getSectionId() == null, "请选择选择标段");
+//            Assert.assertTrue(tPestcPatrolTrackIssue.getMaintenanceCompanyId() == null, "请选择选择养护单位");
+//            // 查询养护公司信息
+//            maintenanceCompany = maintenanceCompanyService.selectById(tPestcPatrolTrackIssue.getMaintenanceCompanyId());
+//            Assert.assertTrue(maintenanceCompany == null, "工单对应养护单位id无法查询到养护单位信息");
+//            yhcompany = yhcompanyMapper.selectById(maintenanceCompany.getOldMaintenanceCompanyId());
+//            // 标段信息
+//            section = sectionService.selectById(tPestcPatrolTrackIssue.getSectionId());
+//            Assert.assertTrue(section == null, "工单对应标段id无法查询到标段信息");
+//
+//            //根据养护单位ID + 标段ID 获取到项目经理
+//            List<TLhgySectionCompany> sectionCompanyList = sectionCompanyMapper.selectList(new QueryWrapper<TLhgySectionCompany>().lambda()
+//                    .eq(TLhgySectionCompany::getYhCompanyId, maintenanceCompany.getOldMaintenanceCompanyId())
+//                    .eq(TLhgySectionCompany::getSectionId, section.getOldSectionId()));
+//            Assert.assertTrue(sectionCompanyList.size() == 0, "当前巡查标段对应的养护单位下未维护项目经理对应关系");
+//
+//            List<Integer> userIds = sectionCompanyList.stream().map(TLhgySectionCompany::getUserId).distinct().collect(Collectors.toList());
+//            //养护单位账号
+//            sysUseraccounts = tSysUseraccountMapper.selectList(new QueryWrapper<TSysUseraccount>().lambda()
+//                    .in(TSysUseraccount::getfUserid, userIds)
+//                    .eq(TSysUseraccount::getfDeleteflag, 0));
+//            Assert.assertTrue(sysUseraccounts.size() == 0, "当前养护单位无法查询到项目经理账户信息");
+//
+//            sectionId = section.getOldSectionId();
+//            sectionName = section.getSectionName();
+//        } else {
+//            return -1;
+//        }
+
+   //     tWoWorkorderbase.setfGlsx(yhcompany.getfGlsx());
+   //     tWoWorkorderbase.setfGlsy(yhcompany.getfGlsy());
+  //      tWoWorkorderbase.setfYhuserid(sysUseraccounts.get(0).getfUserid());
+    //    tWoWorkorderbase.setfYhusername(sysUseraccounts.get(0).getfUsername());
+   //     tWoWorkorderbase.setfYhdeptid(yhcompany.getfYhcompanyid());
+ //       tWoWorkorderbase.setfYhdeptname(yhcompany.getfDeptname());
+   //     tWoWorkorderbase.setfRegionname(yhcompany.getfAddress());
+       // tWoWorkorderbase.setfSguserid(sectionId);
+       // tWoWorkorderbase.setfSgusername(sectionName);
         tWoWorkorderbase.setRiskclassifyname("巡视巡查");//
         tWoWorkorderbase.setfRegionid(0);
         tWoWorkorderbase.setfDeleteflag(0);//
@@ -1746,8 +1751,8 @@ public class LhgyWorkOrderBaseServiceImpl extends ServiceImpl<TWoWorkorderbaseMa
         tWoWorkorderbase.setDeptType(2);
 
         //经济运行平台监管要素编码
-        TPdjgWorkorderCategory workorderCategory = workorderCategoryService.selectByCategoryId(tWoWorkorderbase.getfCategoryid1(), 1);
-        tWoWorkorderbase.setRegulationCode(workorderCategory != null ? workorderCategory.getRegulationCode() : null);
+      //  TPdjgWorkorderCategory workorderCategory = workorderCategoryService.selectByCategoryId(tWoWorkorderbase.getfCategoryid1(), 1);
+     //   tWoWorkorderbase.setRegulationCode(workorderCategory != null ? workorderCategory.getRegulationCode() : null);
 
         String address = "";
         // 区级 踏查
@@ -1835,12 +1840,12 @@ public class LhgyWorkOrderBaseServiceImpl extends ServiceImpl<TWoWorkorderbaseMa
         }
 
         // 如果不是养护单位自己创建的工单，给养护单位添加一条短信发送任务
-        if (tWoWorkorderbase.getfCreateid() != tWoWorkorderbase.getfYhuserid()) {
-            for (TSysUseraccount sysUseraccount : sysUseraccounts) {
-                phone = sysUseraccount.getfMobile();
-                smsSendsmstaskService.insertSmsSendTask(phone, tWoWorkorderbase.getfCreateid(), tWoWorkorderbase.getfCreatename(), tWoWorkorderbase.getfCode(), tWoWorkorderbase.getfWorkordertype());
-            }
-        }
+//        if (tWoWorkorderbase.getfCreateid() != tWoWorkorderbase.getfYhuserid()) {
+//            for (TSysUseraccount sysUseraccount : sysUseraccounts) {
+//                phone = sysUseraccount.getfMobile();
+//                smsSendsmstaskService.insertSmsSendTask(phone, tWoWorkorderbase.getfCreateid(), tWoWorkorderbase.getfCreatename(), tWoWorkorderbase.getfCode(), tWoWorkorderbase.getfWorkordertype());
+//            }
+//        }
 
         //创建工单详情
         TWoWorkorderdetail woWorkorderdetail = new TWoWorkorderdetail();
@@ -1849,15 +1854,15 @@ public class LhgyWorkOrderBaseServiceImpl extends ServiceImpl<TWoWorkorderbaseMa
 
         //创建工单任务单
         TWoWorkordertask tWoWorkordertask = new TWoWorkordertask();
-        for (TSysUseraccount sysUseraccount : sysUseraccounts) {
-            tWoWorkordertask = workordertaskService.insertWorkOrderTask(tWoWorkorderbase, sysUseraccount.getfUserid());
-        }
+//        for (TSysUseraccount sysUseraccount : sysUseraccounts) {
+//            tWoWorkordertask = workordertaskService.insertWorkOrderTask(tWoWorkorderbase, sysUseraccount.getfUserid());
+//        }
         //创建工单历史信息单(创建)
         TWoWorkordertaskdealinfo workordertaskdealinfo = workordertaskdealinfoService.insertWorkOrderTaskDetailInfo(tWoWorkorderbase.getfContent(), tWoWorkorderbase, 1, tWoWorkordertask.getfTaskid(), tWoWorkorderbase.getfYhdeptid(), tWoWorkorderbase.getfYhuserid());
         //创建工单历史信息单（派单）
-        TWoWorkordertaskdealinfo workordertaskdealinfo1 = workordertaskdealinfoService.insertWorkOrderTaskDetailInfo(tWoWorkorderbase.getfContent(), tWoWorkorderbase, 2, tWoWorkordertask.getfTaskid(), tWoWorkorderbase.getfYhdeptid(), tWoWorkorderbase.getfYhuserid());
+      //  TWoWorkordertaskdealinfo workordertaskdealinfo1 = workordertaskdealinfoService.insertWorkOrderTaskDetailInfo(tWoWorkorderbase.getfContent(), tWoWorkorderbase, 2, tWoWorkordertask.getfTaskid(), tWoWorkorderbase.getfYhdeptid(), tWoWorkorderbase.getfYhuserid());
         //上传图片至工单图片表
-        insertPatrolTrackFile(zgzsFileList, tWoWorkorderbase, workordertaskdealinfo1.getfTaskinfoid());
+       insertPatrolTrackFile(zgzsFileList, tWoWorkorderbase, workordertaskdealinfo.getfTaskinfoid());
 
         return tWoWorkorderbase.getfWorkorderid();
     }

src/main/java/com/yt/zhylplat/modulePest/patrolTrack/service/impl/TPestcPatrolTrackIssueServiceImpl.java

@@ -319,7 +319,8 @@ public class TPestcPatrolTrackIssueServiceImpl extends ServiceImpl<TPestcPatrolT
             List<TLhzxCenterEmployeePosition> centerEmployeePositionList = centerEmployeePositionService.listByEntity(centerEmployeePosition);
             if (centerEmployeePositionList != null && centerEmployeePositionList.size() > 0){
                 // 推送给科长
-                smsSendsmstaskService.insertSmsSendTask(centerEmployeePositionList.get(0).getCenterTelPhone(), LoginUserUtil.getfUserid(), LoginUserUtil.getfUsername(), workOrderId + "", "日常管理养护");
+                smsSendsmstaskService.insertSmsSendTask(centerEmployeePositionList.get(0).getCenterTelPhone(), LoginUserUtil.getfUserid(),
+                        LoginUserUtil.getfUsername(), workOrderId + "", "日常管理养护");
             }
             centerEmployeePosition.setJobLevel(2);
             centerEmployeePosition.setProjectName("有害生物防控");

src/main/java/com/yt/zhylplat/service/ITBaseDriveinfoService.java

@@ -46,6 +46,9 @@ public interface ITBaseDriveinfoService extends IService<TBaseDriveinfo> {
      * @return
      */
     ResultResponse saveDriveInfo(TBaseDriveinfoRequest baseRequest);
+
+    ResultResponse updateDriveInfo(TBaseDriveinfoRequest baseRequest);
+
     /**
      * web删除设备的方法
      * @param baseRequest
@@ -57,4 +60,6 @@ public interface ITBaseDriveinfoService extends IService<TBaseDriveinfo> {
 
 
     ResultResponse selectDriveinfoList(int id);
+
+    ResultResponse GetUrl(int id);
 }

src/main/java/com/yt/zhylplat/service/ITWoWorkorderbaseService.java

@@ -240,4 +240,6 @@ public interface ITWoWorkorderbaseService extends IService<TWoWorkorderbase> {
 
 
     IPage<TWoWorkorderbase> selectsworkTypicalList(int id ,int page, int limit);
+
+    ResultResponse dispatchAppOrder(TWoWorkorderbaseRequest data);
 }

src/main/java/com/yt/zhylplat/service/TEquipmentMaintenanceService.java

@@ -18,7 +18,7 @@ public interface TEquipmentMaintenanceService extends IService<TEquipmentMainten
 
     ResultResponse selectMaintenanceByPageList(TEquipmentMaintenanceRequest baseRequest);
 
-    Boolean saveMaintenanceinfo(TEquipmentMaintenance tMapPolygonProperties);
+    Boolean saveMaintenanceinfo(TEquipmentMaintenanceRequest tMapPolygonProperties);
 
     Boolean modify(TEquipmentMaintenance tMapPolygonProperties);
 

src/main/java/com/yt/zhylplat/service/TWorkReportService.java

@@ -0,0 +1,27 @@
+package com.yt.zhylplat.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yt.zhylplat.base.ResultResponse;
+import com.yt.zhylplat.entity.TWorkReport;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author YTKJ
+ * @since 2025-11-17
+ */
+public interface TWorkReportService extends IService<TWorkReport> {
+
+    ResultResponse saveTWorkReport(TWorkReport baseRequest);
+
+    ResultResponse updateTWorkReport(TWorkReport baseRequest);
+
+    ResultResponse deleteTWorkReport(Integer id);
+
+    ResultResponse selectById(Integer id);
+
+    ResultResponse pageList(Page page, TWorkReport WorkReport);
+}

src/main/java/com/yt/zhylplat/service/impl/TBaseDriveinfoServiceImpl.java

@@ -14,6 +14,7 @@ import com.yt.zhylplat.service.ITBaseDrivecategoryService;
 import com.yt.zhylplat.service.ITBaseDriveinfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yt.zhylplat.service.ITBaseParkinfoService;
+import com.yt.zhylplat.utils.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -129,6 +130,24 @@ public class TBaseDriveinfoServiceImpl extends ServiceImpl<TBaseDriveinfoMapper,
     }
 
     @Override
+    public ResultResponse updateDriveInfo(TBaseDriveinfoRequest baseRequest) {
+        TBaseDriveinfo tBaseDriveinfo =baseMapper.selectById(baseRequest.getfDriveid());
+         if (tBaseDriveinfo!=null)
+         {
+             if (StringUtil.isNotBlank(baseRequest.getUrl()))
+             {
+                 tBaseDriveinfo.setUrl(baseRequest.getUrl());
+             }
+             if (StringUtil.isNotBlank(baseRequest.getfImg()))
+             {
+                 tBaseDriveinfo.setfImg(baseRequest.getfImg());
+             }
+         }
+        baseMapper.updateById(tBaseDriveinfo);
+        return ResultResponse.builder().status(ResultCodeEnum.SUCCESS.getCode()).message(ResultCodeEnum.SUCCESS.getMessage()).build();
+    }
+
+    @Override
     public ResultResponse deleteDriveInfo(List<TBaseDriveinfoRequest> baseRequest) {
         if (baseRequest.size() == 0) {
             return ResultResponse.builder().status(ResultCodeEnum.FAILURE_MESSAGE.getCode()).message("删除失败，传入的公园数组为空").build();
@@ -206,6 +225,7 @@ public class TBaseDriveinfoServiceImpl extends ServiceImpl<TBaseDriveinfoMapper,
 
         List<TBaseDriveinfo> Driveinfos = baseMapper.selectList(new QueryWrapper<TBaseDriveinfo>().lambda()
                         .eq(TBaseDriveinfo::getfParkid,id)
+                .eq(TBaseDriveinfo::getfDeleteflag,0)
                 .orderByDesc(TBaseDriveinfo::getfDriveid));
 
         return ResultResponse.builder().status(ResultCodeEnum.SUCCESS.getCode()).
@@ -213,4 +233,21 @@ public class TBaseDriveinfoServiceImpl extends ServiceImpl<TBaseDriveinfoMapper,
                 (Driveinfos).build();
 
     }
+
+    @Override
+    public  ResultResponse GetUrl(int id)
+    {
+        List<TBaseDriveinfo> Driveinfos = baseMapper.selectList(new QueryWrapper<TBaseDriveinfo>().lambda()
+                .eq(TBaseDriveinfo::getfParkid,id)
+                .eq(TBaseDriveinfo::getfDeleteflag,0)
+                .orderByDesc(TBaseDriveinfo::getfDriveid));
+        for (TBaseDriveinfo driveinfo : Driveinfos) {
+           String url=String.format("rtsp://%s:%s@%s:%s/Streaming/Channels/%d",
+                   driveinfo.getfAccount(), driveinfo.getfPassword(), driveinfo.getfIp(),driveinfo.getfPort(), driveinfo.getfChannel());
+            driveinfo.setUrl(url);
+        }
+        return ResultResponse.builder().status(ResultCodeEnum.SUCCESS.getCode()).
+                message(ResultCodeEnum.SUCCESS.getMessage()).data
+                        (Driveinfos).build();
+    }
 }

src/main/java/com/yt/zhylplat/service/impl/TBaseEmployeeinfoServiceImpl.java

@@ -156,7 +156,8 @@ public class TBaseEmployeeinfoServiceImpl extends ServiceImpl<TBaseEmployeeinfoM
                 //如果人员科室不为空，只能查看某一科室下的
                 .eq(request.getfExpandint4() != null, TBaseEmployeeinfo::getfExpandint4, request.getfExpandint4())
                 //如果当前登录人不存在公园中，可直接通过传入公园ID查询公园下所有人员
-                .eq(tBaseEmployeeinfo.getfParkid() == null && request.getfParkid() >0, TBaseEmployeeinfo::getfParkid, request.getfParkid())
+                .eq(tBaseEmployeeinfo.getfParkid() == null &&   request.getfParkid()!=null&&
+                        request.getfParkid() >0, TBaseEmployeeinfo::getfParkid, request.getfParkid())
                 .like(request.getfRealname() != null, TBaseEmployeeinfo::getfRealname, request.getfRealname())
                 .eq(request.getfExpand4() != null&& !Objects.equals(request.getfExpand4(), ""), TBaseEmployeeinfo::getfExpand4, request.getfExpand4())
                 .like(request.getfDuty() != null&& !Objects.equals(request.getfDuty(), ""), TBaseEmployeeinfo::getfDuty, request.getfDuty())

src/main/java/com/yt/zhylplat/service/impl/TEquipmentMaintenanceServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yt.zhylplat.api.response.BasePageResponse;
 import com.yt.zhylplat.base.ResultResponse;
+import com.yt.zhylplat.entity.TBaseDriveinfo;
 import com.yt.zhylplat.entity.TEquipmentMaintenance;
 import com.yt.zhylplat.dao.TEquipmentMaintenanceMapper;
 import com.yt.zhylplat.entity.TEquipmentMaintenanceRequest;
@@ -33,13 +34,15 @@ public class TEquipmentMaintenanceServiceImpl extends ServiceImpl<TEquipmentMain
         Page<TEquipmentMaintenance> page=new Page<>(baseRequest.getCurrent(), baseRequest.getSize());
         LambdaQueryWrapper<TEquipmentMaintenance> queryWrapper=new QueryWrapper<TEquipmentMaintenance>().lambda();
         queryWrapper.orderByDesc(TEquipmentMaintenance::getEquipmentId);
-        queryWrapper.like(StringUtils.isNotEmpty(baseRequest.getEquipmentName()) ,TEquipmentMaintenance::getEquipmentName,baseRequest.getEquipmentName());
+        queryWrapper.like(StringUtils.isNotEmpty(baseRequest.getEquipmentName())
+                ,TEquipmentMaintenance::getEquipmentName,baseRequest.getEquipmentName());
         queryWrapper.eq(baseRequest.getEquipmentId()!=null && baseRequest.getEquipmentId()>0,
                 TEquipmentMaintenance::getEquipmentId,baseRequest.getEquipmentId());
         queryWrapper.like(StringUtils.isNotEmpty(baseRequest.getParkName())
                 ,TEquipmentMaintenance::getParkName,baseRequest.getParkName());
         queryWrapper.eq(baseRequest.getParkId()!=null && baseRequest.getParkId()>0,
                 TEquipmentMaintenance::getParkId,baseRequest.getParkId());
+        queryWrapper.orderByDesc(TEquipmentMaintenance::getId);
         IPage<TEquipmentMaintenance> IPage = baseMapper.selectPage( page,queryWrapper);
         return ResultResponse.builder()
                 .status(ResultCodeEnum.SUCCESS.getCode())
@@ -50,19 +53,20 @@ public class TEquipmentMaintenanceServiceImpl extends ServiceImpl<TEquipmentMain
     }
 
     @Override
-    public Boolean saveMaintenanceinfo(TEquipmentMaintenance tMapPolygonProperties) {
+    public Boolean saveMaintenanceinfo(TEquipmentMaintenanceRequest baseRequest) {
+        TEquipmentMaintenance tMapPolygonProperties = new TEquipmentMaintenance();
+        org.springframework.beans.BeanUtils.copyProperties(baseRequest, tMapPolygonProperties);
         return save(tMapPolygonProperties);
     }
 
     /**
      * 修改
      *
-     * @param tMapPolygonProperties
      * @return
      */
     @Override
-    public Boolean modify(TEquipmentMaintenance tMapPolygonProperties) {
-        return updateById(tMapPolygonProperties);
+    public Boolean modify(TEquipmentMaintenance baseRequest) {
+        return updateById(baseRequest);
     }
     /**
      * 删除

src/main/java/com/yt/zhylplat/service/impl/TPdjgWorkorderCategoryServiceImpl.java

@@ -7,6 +7,8 @@ import com.yt.zhylplat.service.TPdjgWorkorderCategoryService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 工单大类与经济运行平台监管要素对应关系表 服务实现类
@@ -23,11 +25,14 @@ public class TPdjgWorkorderCategoryServiceImpl extends ServiceImpl<TPdjgWorkorde
         if(categoryId == null || type == null){
             return null;
         }
-        TPdjgWorkorderCategory tPdjgWorkorderCategory = baseMapper.selectOne(new QueryWrapper<TPdjgWorkorderCategory>().lambda()
+        List<TPdjgWorkorderCategory> tPdjgWorkorderCategory = baseMapper.selectList(new QueryWrapper<TPdjgWorkorderCategory>().lambda()
             .eq(TPdjgWorkorderCategory::getDeleteFlag,0)
             .eq(TPdjgWorkorderCategory::getCategoryId,categoryId)
             .eq(TPdjgWorkorderCategory::getType,type)
         );
-        return tPdjgWorkorderCategory;
+        if (tPdjgWorkorderCategory!=null&&tPdjgWorkorderCategory.size()>0)
+        return tPdjgWorkorderCategory.get(0);
+        else
+            return null;
     }
 }

src/main/java/com/yt/zhylplat/service/impl/TSmsSendsmstaskServiceImpl.java

@@ -37,12 +37,13 @@ public class TSmsSendsmstaskServiceImpl extends ServiceImpl<TSmsSendsmstaskMappe
     public void insertSmsSendTask(String mobile, Integer userId,String userName,String workCode, String type) {
         TSmsSendsmstask tSmsSendsmstask = new TSmsSendsmstask();
         Map<String, Object> map1 = new HashMap<>();
-        String code = "";
-        if(StringUtil.isEmpty(workCode)){
-            code = workCode;
-        } else {
-            code = workCode.substring(7,workCode.length());
-        }
+        String  code = workCode;
+//        if(StringUtil.isEmpty(workCode)){
+//            code = workCode;
+//        } else {
+//
+//            code = workCode.substring(7,workCode.length());
+//        }
         map1.put("code", code);
         map1.put("type", type);
         String string = JSONObject.toJSONString(map1);

src/main/java/com/yt/zhylplat/service/impl/TSpActivitybaseServiceImpl.java

@@ -206,7 +206,10 @@ public class TSpActivitybaseServiceImpl extends ServiceImpl<TSpActivitybaseMappe
         tSpActivityTask.setfActivitytypeid(tSpActivitybase.getfActivitytypeid());
         tSpActivityTask.setfCreatedate(new Date());
         //申请之后 生成一条任务或者说创建了一个任务 任务的所属人id就是下一个处理人的id
-        tSpActivityTask.setfOwnerid(Integer.parseInt(tSpActivitybase.getfNextnameid()));
+        if(fNextid!=null)
+        {
+            tSpActivityTask.setfOwnerid(Integer.parseInt(tSpActivitybase.getfNextnameid()));
+        }
         tSpActivityTask.setfStateid(tSpActivitybase.getfStateid());//活动状态
         tSpActivityTask.setfLoseflag(0);// 0未失效 1 已失效
         tSpActivitytaskMapper.insert(tSpActivityTask);
@@ -1382,8 +1385,8 @@ public class TSpActivitybaseServiceImpl extends ServiceImpl<TSpActivitybaseMappe
 
         tSpActivitybase.setfNextnameid("");//下步审批处理人id
         tSpActivitybase.setfNextname("");//下步审批处理人名字
-        tSpActivitybase.setfState("备案结束");
-        tSpActivitybase.setfStateid(5);
+        tSpActivitybase.setfState("不同意备案");
+        tSpActivitybase.setfStateid(3);
         tSpActivitybase.setStatus("4");
         tSpActivitybase.setfDeleteflag(0);
         baseMapper.updateById(tSpActivitybase);

src/main/java/com/yt/zhylplat/service/impl/TSysUseraccountServiceImpl.java

@@ -15,6 +15,8 @@ import com.yt.zhylplat.common.LoginUserUtil;
 import com.yt.zhylplat.dao.*;
 import com.yt.zhylplat.entity.*;
 import com.yt.zhylplat.enums.ResultCodeEnum;
+import com.yt.zhylplat.moduleWx.entity.TWxUserinfo;
+import com.yt.zhylplat.moduleWx.mapper.TWxUserinfoMapper;
 import com.yt.zhylplat.service.ITSysUseraccountService;
 import com.yt.zhylplat.utils.Aes;
 import com.yt.zhylplat.utils.HttpURLConnectionUtil;
@@ -55,6 +57,8 @@ public class TSysUseraccountServiceImpl extends ServiceImpl<TSysUseraccountMappe
 
     @Autowired
     TBaseEmployeeinfoMapper employeeinfoMapper;
+    @Autowired
+    TWxUserinfoMapper wxUserinfoMapper;
 
 
     @Override
@@ -386,7 +390,8 @@ public class TSysUseraccountServiceImpl extends ServiceImpl<TSysUseraccountMappe
     public ResultResponse getUserOpenIdAndSessionKey(TSysUseraccountRequest baseRequest){
         Assert.assertTrue(baseRequest.getCode() == null, "当前传入用户 code 为空");
         //根据微信用户 code 获取 openID
-        String requestUrl = "https://api.weixin.qq.com/sns/jscode2session?appid=" + BaseConfiguration.WX_APPID + "&secret=" + BaseConfiguration.WX_APPSECRET + "&js_code=" + baseRequest.getCode() + "&grant_type=authorization_code";
+        String requestUrl = "https://api.weixin.qq.com/sns/jscode2session?appid=" + BaseConfiguration.WX_APPID +
+                "&secret=" + BaseConfiguration.WX_APPSECRET + "&js_code=" + baseRequest.getCode() + "&grant_type=authorization_code";
         Map<String, String> result = new HashMap<>();
         String response = HttpURLConnectionUtil.sendGet(requestUrl);
         JSONObject OpenidJSONO = JSONObject.fromObject(response);
@@ -396,6 +401,44 @@ public class TSysUseraccountServiceImpl extends ServiceImpl<TSysUseraccountMappe
         result.put("openId", openId);
         result.put("sessionKey", sessionKey);
 
+
+        //region 添加
+        try
+        {   //同步绑定
+            LambdaQueryWrapper<TWxUserinfo> tLambdaQueryWrapper = new QueryWrapper<TWxUserinfo>().lambda();
+            tLambdaQueryWrapper.eq(TWxUserinfo::getDeleteFlag, 0);
+            tLambdaQueryWrapper.eq(TWxUserinfo::getWxOpenId, openId);
+            tLambdaQueryWrapper.eq(TWxUserinfo::getUserId, baseRequest.getfUserid());
+            List<TWxUserinfo> list=wxUserinfoMapper.selectList(tLambdaQueryWrapper);
+            if(list!=null&&list.size()>0){
+                list.get(0).setDeleteFlag(0);
+                list.get(0).setStateFlag(1);
+                list.get(0).setWxOpenType(0);
+                list.get(0).setMessageFlag(1);
+                list.get(0).setWxOpenId(openId);
+                list.get(0).setCreateTime(new Date());
+                list.get(0).setCreateUserid(LoginUserUtil.getfUserid());
+                list.get(0).setCreateUsername(LoginUserUtil.getfUsername());
+                wxUserinfoMapper.updateById(list.get(0));
+            }
+            else {
+                TWxUserinfo model=new TWxUserinfo();
+                model.setDeleteFlag(0);
+                model.setStateFlag(1);
+                model.setWxOpenType(0);
+                model.setMessageFlag(1);
+                model.setCreateTime(new Date());
+                model.setWxOpenId(openId);
+                model.setCreateUserid(LoginUserUtil.getfUserid());
+                model.setCreateUsername(LoginUserUtil.getfUsername());
+                wxUserinfoMapper.insert(model);
+            }
+
+        }
+        catch (Exception E){};
+
+
+
         return ResultResponse.builder()
                 .status(ResultCodeEnum.SUCCESS.getCode())
                 .message(ResultCodeEnum.SUCCESS.getMessage())

src/main/java/com/yt/zhylplat/service/impl/TWoWorkorderbaseServiceImpl.java

@@ -1015,7 +1015,7 @@ private TWoWorkorderstatesMapper tWoWorkorderstatesMapper;
             collect = new ArrayList<>();
             collect = noLoseWorkTask.stream().map(TWoWorkordertask::getfWorkorderid).distinct().collect(Collectors.toList());
         }
-        unDisposeWorkOrderList = selectWorkBaseList(ts,0,collect,false,false);
+        unDisposeWorkOrderList = selectWorkBaseList(ts,0,collect,1);
 
         //处理中任务（工单状态 != 4 任务表有当前用户已失效任务）
         List<TWoWorkordertask> loseWorkTask = tWoWorkordertaskMapper.selectList(new QueryWrapper<TWoWorkordertask>().lambda()
@@ -1026,7 +1026,7 @@ private TWoWorkorderstatesMapper tWoWorkorderstatesMapper;
             collect = new ArrayList<>();
             collect = loseWorkTask.stream().map(TWoWorkordertask::getfWorkorderid).distinct().collect(Collectors.toList());
         }
-        DisposeingWorkOrderList = selectWorkBaseList(ts,isParkCenter,collect,false,true);
+        DisposeingWorkOrderList = selectWorkBaseList(ts,isParkCenter,collect,2);
 
         //已完结任务（工单状态 = 4 任务表有当前用户任务）
         List<TWoWorkordertask> overWorkTask = tWoWorkordertaskMapper.selectList(new QueryWrapper<TWoWorkordertask>().lambda()
@@ -1036,7 +1036,7 @@ private TWoWorkorderstatesMapper tWoWorkorderstatesMapper;
             collect = new ArrayList<>();
             collect = overWorkTask.stream().map(TWoWorkordertask::getfWorkorderid).distinct().collect(Collectors.toList());
         }
-        finishWorkOrderList = selectWorkBaseList(ts,isParkCenter,collect,true,true);
+        finishWorkOrderList = selectWorkBaseList(ts,isParkCenter,collect,4);
 
         map.put("unDisposeWorkOrderList", unDisposeWorkOrderList);
         map.put("DisposeingWorkOrderList", DisposeingWorkOrderList);
@@ -1190,8 +1190,7 @@ private TWoWorkorderstatesMapper tWoWorkorderstatesMapper;
     }
 
 
-    private IPage selectWorkBaseList(TWoWorkorderbaseRequest ts,Integer isParkCenter,List<Integer> workTaskList,boolean state,
-                                     boolean isTask){
+    private IPage selectWorkBaseList(TWoWorkorderbaseRequest ts,Integer isParkCenter,List<Integer> workTaskList,int state){
 
         int current = ts.getCurrent();
         int size = ts.getSize();
@@ -1201,8 +1200,7 @@ private TWoWorkorderstatesMapper tWoWorkorderstatesMapper;
         LambdaQueryWrapper<TWoWorkorderbase> lambdaQueryWrapper = new QueryWrapper<TWoWorkorderbase>().lambda()
                 .eq(TWoWorkorderbase::getfDeleteflag, 0)
                 .eq(TWoWorkorderbase::getfWorkordertypeid, ts.getfWorkordertypeid())//工单类型
-                .ne(state == false, TWoWorkorderbase::getfStateid, 4)//工单状态不等于4
-                .eq(state == true, TWoWorkorderbase::getfStateid, 4)//工单状态不等于4
+                .eq(TWoWorkorderbase::getfStateid, state)//工单状态不等于4
                 .like(ts.getfSgusername() != null, TWoWorkorderbase::getfSgusername, ts.getfSgusername())
                 .like(ts.getfYhdeptname() != null, TWoWorkorderbase::getfYhdeptname, ts.getfYhdeptname())
                 .like(ts.getfYhusername() != null, TWoWorkorderbase::getfYhusername, ts.getfYhusername())
@@ -1214,7 +1212,7 @@ private TWoWorkorderstatesMapper tWoWorkorderstatesMapper;
                 //考核结束时间
                 .le(ts.getEndTime() != null, TWoWorkorderbase::getfCreatedate, ts.getEndTime())
                 .and(isParkCenter == 0, QueryWrapper -> QueryWrapper
-                        .eq(isTask, TWoWorkorderbase::getfCreateid, LoginUserUtil.getfUserid())//创建人
+                        .eq(true, TWoWorkorderbase::getfCreateid, LoginUserUtil.getfUserid())//创建人
                         .or()
                         .in(workTaskList.size() > 0, TWoWorkorderbase::getfWorkorderid, workTaskList)
                 )
@@ -1283,7 +1281,72 @@ private TWoWorkorderstatesMapper tWoWorkorderstatesMapper;
                 .data(BasePageResponse.builder().current((int) tWoWorkorderbaseIPage.getCurrent()).size((int) tWoWorkorderbaseIPage.getSize()).total((int) tWoWorkorderbaseIPage.getTotal()).pages((int) tWoWorkorderbaseIPage.getPages()).data(tWoWorkorderbaseIPage.getRecords()).build()).build();
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public ResultResponse dispatchAppOrder(TWoWorkorderbaseRequest request) {
+        TSysUseraccount tSysUseraccount = null;
+       // TBaseParkinfo tBaseParkinfo = null;
+        TWoWorkordertaskdealinfo woWorkordertaskdealinfo = null;
+        Assert.assertTrue(request.getfYhuserid()== null, "派单人不可为空");
+        TWoWorkorderbase ts = baseMapper.selectById(request.getfWorkorderid());
+            tSysUseraccount = tSysUseraccountMapper.selectById(request.getfYhuserid());
+            Assert.assertTrue(tSysUseraccount == null, "请选择接收人");
+//            ts.setfX(tBaseParkinfo.getfX());
+//            ts.setfY(tBaseParkinfo.getfY());
+//            ts.setfGlsx(tBaseParkinfo.getfGlsx());
+//            ts.setfGlsy(tBaseParkinfo.getfGlsy());
+            ts.setfYhuserid(tSysUseraccount.getfUserid());
+            ts.setfYhusername(tSysUseraccount.getfUsername());
+//            ts.setfYhdeptid(tBaseParkinfo.getfYhcompanyid());
+//            ts.setfSgusername(tBaseParkinfo.getfParkname());
+//            ts.setfYhdeptname(tBaseParkinfo.getfYhcompanyname());
+//            ts.setfRegionname(tBaseParkinfo.getfStreet());
+
+            ts.setfStateid(2);
+            ts.setfState("派单");
+            ts.setCheckdept(ts.getfYhdeptname());
+            baseMapper.updateById(ts);
+
+            //失效预警任务单
+            workordertaskService.loseWorkOrderTask(ts, 1);
+
+            //派单任务单
+            TWoWorkordertask tWoWorkordertask = workordertaskService.insertWorkOrderTask(ts,ts.getfYhuserid());
+            Integer parkid=null;
+            if (StringUtil.isNotBlank(tSysUseraccount.getfParkid()))
+            {
+                parkid= Integer.valueOf(tSysUseraccount.getfParkid());
+            }
+            //插入派单历史
+            woWorkordertaskdealinfo = workordertaskdealinfoService.insertWorkOrderTaskDetailInfo(ts.getfContent(), ts,
+                    2, tWoWorkordertask.getfTaskid(),parkid, tSysUseraccount.getfUserid());
+
+        //发送派单消息
+        try{
+            LambdaQueryWrapper<TWxUserinfo> tLambdaQueryWrapper = new QueryWrapper<TWxUserinfo>().lambda();
+            tLambdaQueryWrapper.orderByDesc(TWxUserinfo::getId);
+            tLambdaQueryWrapper.eq(TWxUserinfo::getDeleteFlag, 0);
+            tLambdaQueryWrapper.eq(TWxUserinfo::getStateFlag, 1);
+            tLambdaQueryWrapper.eq(TWxUserinfo::getUserId, tSysUseraccount.getfUserid());
+            List<TWxUserinfo> wxlist =tWxUserinfoMapper.selectList(tLambdaQueryWrapper);
+
+            if(wxlist!=null)
+            {
+                if(wxlist.size()>0){
+                    for(TWxUserinfo wxmodel:wxlist){
+                        if(wxmodel.getWxOpenId()!=null) {
+                            // 微信推送消息
+                            SendMessageWxController.SendDiaryWarningMessage
+                                    (ts, wxmodel.getWxOpenId(),"派单通知");
+                        }
+                    }
+                }
+            }
+        }catch (Exception ignored){
+        }
+        return ResultResponse.builder().status(ResultCodeEnum.SUCCESS.getCode()).message(ResultCodeEnum.SUCCESS.getMessage()).data(ts).build();
 
+
+    }
     @Transactional(rollbackFor = Exception.class)
     public ResultResponse saveWorkorderbase(Map<String, Object> map) {
         TSysUseraccount tSysUseraccount = null;
@@ -1295,59 +1358,86 @@ private TWoWorkorderstatesMapper tWoWorkorderstatesMapper;
 
         String phone = "";
 
+
         //派单
         if (ts.getfWorkorderid() != null) {
 
-            Assert.assertTrue(ts.getfSguserid() == null, "未选择公园园长");
-
-            tBaseParkinfo = tBaseParkinfoMapper.selectById(ts.getfSguserid());
-            Assert.assertTrue(tBaseParkinfo == null, "工单对应公园id无法查询到公园信息");
+//            Assert.assertTrue(ts.getfSguserid() == null, "未选择公园园长");
+//
+//            tBaseParkinfo = tBaseParkinfoMapper.selectById(ts.getfSguserid());
+//            Assert.assertTrue(tBaseParkinfo == null, "工单对应公园id无法查询到公园信息");
+//
+//            //公园园长信息
+//            TBaseEmployeeinfo tBaseEmployeeinfo = tBaseEmployeeinfoMapper.selectOne(new QueryWrapper<TBaseEmployeeinfo>().lambda()
+//                    .eq(TBaseEmployeeinfo::getfParkid, tBaseParkinfo.getfParkid())
+//                    .eq(TBaseEmployeeinfo::getfExpand1, 1));
+//            Assert.assertTrue(tBaseEmployeeinfo == null, "工单对应公园id无法查询到公园园长信息");
+//
+//            phone = tBaseEmployeeinfo.getfPhone();
+//
+//            tSysUseraccount = tSysUseraccountMapper.selectById(tBaseEmployeeinfo.getfExpandint3());
+//            Assert.assertTrue(tSysUseraccount == null, "工单对应公园园长无法查询到公园园长用户信息");
+//
+//            ts.setfX(tBaseParkinfo.getfX());
+//            ts.setfY(tBaseParkinfo.getfY());
+//            ts.setfGlsx(tBaseParkinfo.getfGlsx());
+//            ts.setfGlsy(tBaseParkinfo.getfGlsy());
+//            ts.setfYhuserid(tSysUseraccount.getfUserid());
+//            ts.setfYhusername(tSysUseraccount.getfUsername());
+//            ts.setfYhdeptid(tBaseParkinfo.getfYhcompanyid());
+//            ts.setfSgusername(tBaseParkinfo.getfParkname());
+//            ts.setfYhdeptname(tBaseParkinfo.getfYhcompanyname());
+//            ts.setfRegionname(tBaseParkinfo.getfStreet());
+//
+//            ts.setfStateid(2);
+//            ts.setfState("派单");
+//            ts.setCheckdept(ts.getfYhdeptname());
+//            baseMapper.updateById(ts);
+//
+//            //失效预警任务单
+//            workordertaskService.loseWorkOrderTask(ts, 1);
+//
+//            //派单任务单
+//            TWoWorkordertask tWoWorkordertask = workordertaskService.insertWorkOrderTask(ts,ts.getfYhuserid());
+//
+//            //插入派单历史
+//            woWorkordertaskdealinfo = workordertaskdealinfoService.insertWorkOrderTaskDetailInfo(ts.getfContent(), ts, 2, tWoWorkordertask.getfTaskid(), tBaseParkinfo.getfParkid(), tSysUseraccount.getfUserid());
 
-            //公园园长信息
-            TBaseEmployeeinfo tBaseEmployeeinfo = tBaseEmployeeinfoMapper.selectOne(new QueryWrapper<TBaseEmployeeinfo>().lambda()
-                    .eq(TBaseEmployeeinfo::getfParkid, tBaseParkinfo.getfParkid())
-                    .eq(TBaseEmployeeinfo::getfExpand1, 1));
-            Assert.assertTrue(tBaseEmployeeinfo == null, "工单对应公园id无法查询到公园园长信息");
 
-            phone = tBaseEmployeeinfo.getfPhone();
 
-            tSysUseraccount = tSysUseraccountMapper.selectById(tBaseEmployeeinfo.getfExpandint3());
-            Assert.assertTrue(tSysUseraccount == null, "工单对应公园园长无法查询到公园园长用户信息");
+            //增加工单任务表
+            TWoWorkordertask tWoWorkordertask = workordertaskService.
+                    insertWorkOrderTask(ts,ts.getfSguserid() != null ? ts.getfYhuserid() : LoginUserUtil.getfUserid());
 
-            ts.setfX(tBaseParkinfo.getfX());
-            ts.setfY(tBaseParkinfo.getfY());
-            ts.setfGlsx(tBaseParkinfo.getfGlsx());
-            ts.setfGlsy(tBaseParkinfo.getfGlsy());
-            ts.setfYhuserid(tSysUseraccount.getfUserid());
-            ts.setfYhusername(tSysUseraccount.getfUsername());
-            ts.setfYhdeptid(tBaseParkinfo.getfYhcompanyid());
-            ts.setfSgusername(tBaseParkinfo.getfParkname());
-            ts.setfYhdeptname(tBaseParkinfo.getfYhcompanyname());
-            ts.setfRegionname(tBaseParkinfo.getfStreet());
 
-            ts.setfStateid(2);
-            ts.setfState("派单");
-            ts.setCheckdept(ts.getfYhdeptname());
-            baseMapper.updateById(ts);
 
-            //失效预警任务单
-            workordertaskService.loseWorkOrderTask(ts, 1);
-
-            //派单任务单
-            TWoWorkordertask tWoWorkordertask = workordertaskService.insertWorkOrderTask(ts,ts.getfYhuserid());
+            //增加工单历史表(一条预警)
+            ts.setfStateid(1);
+            if (ts.getfWorkordertypeid()==3)
+            {
+                ts.setfState("日常");
+            }
+            else
+            {
+                ts.setfState("预警");
+            }
+            TWoWorkordertaskdealinfo tWoWorkordertaskdealinfo =
+                    workordertaskdealinfoService.insertWorkOrderTaskDetailInfo(ts.getfContent(),
+                            ts, 1, tWoWorkordertask.getfTaskid(), null,null);
 
-            //插入派单历史
-            woWorkordertaskdealinfo = workordertaskdealinfoService.insertWorkOrderTaskDetailInfo(ts.getfContent(), ts, 2, tWoWorkordertask.getfTaskid(), tBaseParkinfo.getfParkid(), tSysUseraccount.getfUserid());
             //处理工单图片
             if (map.get("fileInfoList") != null) {
                 List<TWoFileinfo> fileinfoList = JSONObject.parseArray(JSONObject.toJSONString(map.get("fileInfoList")), TWoFileinfo.class);
-                woFileinfoService.insertImageList(ts, woWorkordertaskdealinfo.getfTaskinfoid(), fileinfoList);
+                woFileinfoService.insertImageList(ts,tWoWorkordertaskdealinfo.getfTaskinfoid(), fileinfoList);
             }
             //处理工单附件
             if (map.get("wordInfoList") != null) {
                 List<TWoFileinfo> wordInfoList = JSONObject.parseArray(JSONObject.toJSONString(map.get("wordInfoList")), TWoFileinfo.class);
-                woFileinfoService.insertWordList(ts, woWorkordertaskdealinfo.getfTaskinfoid(), wordInfoList);
+                woFileinfoService.insertWordList(ts, tWoWorkordertaskdealinfo.getfTaskinfoid(), wordInfoList);
             }
+
+
+
             return ResultResponse.builder().status(ResultCodeEnum.SUCCESS.getCode()).message(ResultCodeEnum.SUCCESS.getMessage()).data(ts).build();
         } else {//保存
 
@@ -1368,33 +1458,40 @@ private TWoWorkorderstatesMapper tWoWorkorderstatesMapper;
 
 
             //如果创建工单时未选择公园，默认状态为预警
-            ts.setfStateid(ts.getfSguserid() != null ? 2 : 1);
-            ts.setfState(ts.getfSguserid() != null ? "派单" : "预警");
-
-            if (ts.getfSguserid() != null) {
-                tBaseParkinfo = tBaseParkinfoMapper.selectById(ts.getfSguserid());
-                Assert.assertTrue(tBaseParkinfo == null, "工单对应公园id无法查询到公园信息");
-
-                //公园园长信息
-                TBaseEmployeeinfo tBaseEmployeeinfo = tBaseEmployeeinfoMapper.selectOne(new QueryWrapper<TBaseEmployeeinfo>().lambda()
-                        .eq(TBaseEmployeeinfo::getfParkid, tBaseParkinfo.getfParkid())
-                        .eq(TBaseEmployeeinfo::getfExpand1, 1));
-                Assert.assertTrue(tBaseEmployeeinfo == null, "工单对应公园id无法查询到公园园长信息");
-
-                phone = tBaseEmployeeinfo.getfPhone();
-                tSysUseraccount = tSysUseraccountMapper.selectById(tBaseEmployeeinfo.getfExpandint3());
-                Assert.assertTrue(tSysUseraccount == null, "工单对应公园园长无法查询到公园园长用户信息");
-
-                ts.setfX(tBaseParkinfo.getfX());
-                ts.setfY(tBaseParkinfo.getfY());
-                ts.setfGlsx(tBaseParkinfo.getfGlsx());
-                ts.setfGlsy(tBaseParkinfo.getfGlsy());
-                ts.setfYhuserid(tSysUseraccount.getfUserid());
-                ts.setfYhusername(tSysUseraccount.getfUsername());
-                ts.setfYhdeptid(tBaseParkinfo.getfYhcompanyid());
-                ts.setfYhdeptname(tBaseParkinfo.getfYhcompanyname());
-                ts.setfRegionname(tBaseParkinfo.getfStreet());
+            ts.setfStateid(1);
+            if (ts.getfWorkordertypeid()==3)
+            {
+                ts.setfState("日常");
             }
+            else
+            {
+                ts.setfState("预警");
+            }
+
+//            if (ts.getfSguserid() != null) {
+//                tBaseParkinfo = tBaseParkinfoMapper.selectById(ts.getfSguserid());
+//                Assert.assertTrue(tBaseParkinfo == null, "工单对应公园id无法查询到公园信息");
+//
+//                //公园园长信息
+//                TBaseEmployeeinfo tBaseEmployeeinfo = tBaseEmployeeinfoMapper.selectOne(new QueryWrapper<TBaseEmployeeinfo>().lambda()
+//                        .eq(TBaseEmployeeinfo::getfParkid, tBaseParkinfo.getfParkid())
+//                        .eq(TBaseEmployeeinfo::getfExpand1, 1));
+//                Assert.assertTrue(tBaseEmployeeinfo == null, "工单对应公园id无法查询到公园园长信息");
+//
+//                phone = tBaseEmployeeinfo.getfPhone();
+//                tSysUseraccount = tSysUseraccountMapper.selectById(tBaseEmployeeinfo.getfExpandint3());
+//                Assert.assertTrue(tSysUseraccount == null, "工单对应公园园长无法查询到公园园长用户信息");
+//
+//                ts.setfX(tBaseParkinfo.getfX());
+//                ts.setfY(tBaseParkinfo.getfY());
+//                ts.setfGlsx(tBaseParkinfo.getfGlsx());
+//                ts.setfGlsy(tBaseParkinfo.getfGlsy());
+//                ts.setfYhuserid(tSysUseraccount.getfUserid());
+//                ts.setfYhusername(tSysUseraccount.getfUsername());
+//                ts.setfYhdeptid(tBaseParkinfo.getfYhcompanyid());
+//                ts.setfYhdeptname(tBaseParkinfo.getfYhcompanyname());
+//                ts.setfRegionname(tBaseParkinfo.getfStreet());
+//            }
 
             ts.setfSgdeptname("0,0,1,0");
             ts.setSyncstatus(1);
@@ -1426,28 +1523,30 @@ private TWoWorkorderstatesMapper tWoWorkorderstatesMapper;
 
             //增加工单历史表(一条预警，一条派单)
             ts.setfStateid(1);
-            TWoWorkordertaskdealinfo tWoWorkordertaskdealinfo = workordertaskdealinfoService.insertWorkOrderTaskDetailInfo(ts.getfContent(), ts, 1, tWoWorkordertask.getfTaskid(), null,null);
-
-            //如果选择了公园，创建一条派单历史
-            ts.setfStateid(2);
-            if (ts.getfSguserid() != null) {
-                woWorkordertaskdealinfo =  workordertaskdealinfoService.insertWorkOrderTaskDetailInfo(ts.getfContent(), ts, 2, tWoWorkordertask.getfTaskid(), tBaseParkinfo.getfParkid(), tSysUseraccount.getfUserid());
-            }
+            TWoWorkordertaskdealinfo tWoWorkordertaskdealinfo =
+                    workordertaskdealinfoService.insertWorkOrderTaskDetailInfo(ts.getfContent(),
+                            ts, 1, tWoWorkordertask.getfTaskid(), null,null);
+
+//            //如果选择了公园，创建一条派单历史
+//            ts.setfStateid(2);
+//            if (ts.getfSguserid() != null) {
+//                woWorkordertaskdealinfo =  workordertaskdealinfoService.insertWorkOrderTaskDetailInfo(ts.getfContent(), ts, 2, tWoWorkordertask.getfTaskid(), tBaseParkinfo.getfParkid(), tSysUseraccount.getfUserid());
+//            }
             //处理工单图片
             if (map.get("fileInfoList") != null) {
                 List<TWoFileinfo> fileinfoList = JSONObject.parseArray(JSONObject.toJSONString(map.get("fileInfoList")), TWoFileinfo.class);
-                woFileinfoService.insertImageList(ts, ts.getfSguserid() != null ? woWorkordertaskdealinfo.getfTaskinfoid() : tWoWorkordertaskdealinfo.getfTaskinfoid(), fileinfoList);
+                woFileinfoService.insertImageList(ts,tWoWorkordertaskdealinfo.getfTaskinfoid(), fileinfoList);
             }
             //处理工单附件
             if (map.get("wordInfoList") != null) {
                 List<TWoFileinfo> wordInfoList = JSONObject.parseArray(JSONObject.toJSONString(map.get("wordInfoList")), TWoFileinfo.class);
-                woFileinfoService.insertWordList(ts, ts.getfSguserid() != null ? woWorkordertaskdealinfo.getfTaskinfoid() : tWoWorkordertaskdealinfo.getfTaskinfoid(), wordInfoList);
+                woFileinfoService.insertWordList(ts,tWoWorkordertaskdealinfo.getfTaskinfoid(), wordInfoList);
             }
 
-            //如果不是园长自己创建的工单，给园长添加一条短信发送任务
-            if (ts.getfCreateid() != ts.getfYhuserid()) {
-                smsSendsmstaskService.insertSmsSendTask(phone,ts.getfCreateid(),ts.getfCreatename(),ts.getfCode(),ts.getfWorkordertype());
-            }
+//            //如果不是园长自己创建的工单，给园长添加一条短信发送任务
+//            if (ts.getfCreateid() != ts.getfYhuserid()) {
+//                smsSendsmstaskService.insertSmsSendTask(phone,ts.getfCreateid(),ts.getfCreatename(),ts.getfCode(),ts.getfWorkordertype());
+//            }
 
             return ResultResponse.builder().status(ResultCodeEnum.SUCCESS.getCode()).message(ResultCodeEnum.SUCCESS.getMessage()).data(ts).build();
         }
@@ -1489,15 +1588,6 @@ private TWoWorkorderstatesMapper tWoWorkorderstatesMapper;
         //处置工单
         if (request.getAcceptOrDispose() == 2) {
             Assert.assertTrue(workorderbase.getfStateid() == 3,"工单已经处置，请不要重复处置");
-            //公园园长信息
-//            TBaseEmployeeinfo tBaseEmployeeinfo = tBaseEmployeeinfoMapper.selectOne(new QueryWrapper<TBaseEmployeeinfo>().lambda()
-//                    .eq(TBaseEmployeeinfo::getfExpandint3, LoginUserUtil.getfUserid()));
-//            if (tBaseEmployeeinfo == null) {
-//
-//                TBaseYhcompany tBaseYhcompany = tBaseYhcompanyMapper.selectOne(new QueryWrapper<TBaseYhcompany>().lambda()
-//                        .eq(TBaseYhcompany::getfYhcompanyid, tBaseEmployeeinfo.getfYhcompanyid()));
-//            }
-
             if (woWorkordertaskdealinfos.size() == 0) {
                 tWoWorkorderbase.setJstime(new Date());
                 //接收任务单
@@ -1919,15 +2009,22 @@ private TWoWorkorderstatesMapper tWoWorkorderstatesMapper;
         tWorkorderbasLambdaQueryWrapper.eq(baseRequest.getfWorkordertypeid()>0,TWoWorkorderbase::getfWorkordertypeid,baseRequest.getfWorkordertypeid());
 //        tWorkorderbasLambdaQueryWrapper.in(baseRequest.getDeptType()<2,TWoWorkorderbase::getDeptType,0,1);
         tWorkorderbasLambdaQueryWrapper.eq(stateid!=null&&stateid>0,TWoWorkorderbase::getfStateid,stateid);
+        tWorkorderbasLambdaQueryWrapper.eq(baseRequest.getfSguserid()!=null&&baseRequest.getfSguserid()>0,TWoWorkorderbase::getfSguserid,baseRequest.getfSguserid());
         tWorkorderbasLambdaQueryWrapper.like(baseRequest.getfSgusername()!=null&&baseRequest.getfSgusername().length()>0,TWoWorkorderbase::getfSgusername,baseRequest.getfSgusername());
         tWorkorderbasLambdaQueryWrapper.like(baseRequest.getfCode()!=null&&baseRequest.getfCode().length()>0,TWoWorkorderbase::getfCode,baseRequest.getfCode());
         tWorkorderbasLambdaQueryWrapper.apply(StringUtils.isNotBlank(queryStime), "date_format (F_CreateDate,'%Y-%m-%d') >= date_format('" + queryStime + "','%Y-%m-%d')");
         tWorkorderbasLambdaQueryWrapper .apply(StringUtils.isNotBlank(queryEtime), "date_format (F_CreateDate,'%Y-%m-%d') <= date_format('" + queryEtime + "','%Y-%m-%d')");
         IPage<TWoWorkorderbase> IPage = baseMapper.selectPage( tWorkorderbasePage,tWorkorderbasLambdaQueryWrapper);
+        Integer overTime=0;
+
         return ResultResponse.builder()
                 .status(ResultCodeEnum.SUCCESS.getCode())
                 .message(ResultCodeEnum.SUCCESS.getMessage())
-                .data(BasePageResponse.builder().current((int) IPage.getCurrent()).size((int) IPage.getSize()).total((int) IPage.getTotal()).pages((int) IPage.getPages()).data(IPage.getRecords()).build()).build();
+                .data(BasePageResponse.builder().current((int)
+                        IPage.getCurrent()).size((int) IPage.getSize()).total((int)
+                        IPage.getTotal()).pages((int) IPage.getPages()).data(IPage.getRecords() ).build()
+
+                ).build();
     }
 
     @Override
@@ -2252,6 +2349,9 @@ private TWoWorkorderstatesMapper tWoWorkorderstatesMapper;
         tWoWorkorderbase.setfFromcode(generateCode.generateWorkFromCode());
         tWoWorkorderbase.setfStateid(2);
         tWoWorkorderbase.setfState("派单");
+
+
+
         tWoWorkorderbase.setRiskclassifyname("市民反馈");//
         tWoWorkorderbase.setfRegionid(0);
         tWoWorkorderbase.setfDeleteflag(0);//
@@ -2369,14 +2469,14 @@ private TWoWorkorderstatesMapper tWoWorkorderstatesMapper;
     public ResultResponse smartDiscovery(int id ) {
         Map<String, Object> map = new LinkedHashMap<>();
         List<TWoWorkorderbase> tWoWorkorderbaseslist = workorderbaseService.list(new QueryWrapper<TWoWorkorderbase>().lambda()
-                .eq(TWoWorkorderbase::getfWorkordertypeid, 4)
+                .eq(TWoWorkorderbase::getfWorkordertypeid, 11)
                 .eq(TWoWorkorderbase::getfDeleteflag,0)
                 .eq(TWoWorkorderbase::getfSguserid,id)
         );
         long  total=tWoWorkorderbaseslist.size();//总数
         long  endTotal= tWoWorkorderbaseslist.stream().filter(t -> t.getfStateid().equals(4)).count();//已完结
         long  tobeTotal= tWoWorkorderbaseslist.stream().filter(t -> t.getfStateid()!=4).count();//未完结
-        long  IoTTotal= tWoWorkorderbaseslist.stream().filter(t -> t.getfFromref()!=null&& t.getfFromref().equals("物联感知")).count();//物联感知
+        long  IoTTotal= tWoWorkorderbaseslist.stream().filter(t -> t.getfCategoryid1()==14).count();//智能预警
         long  bigDataTotal= tWoWorkorderbaseslist.stream().filter(t ->t.getfFromref()!=null&& t.getfFromref().equals("视频捕捉")).count();//数据分析
 
 

src/main/java/com/yt/zhylplat/service/impl/TWoXctaskbaseinfoServiceImpl.java

@@ -127,12 +127,16 @@ TWoXccategoryinfoMapper tWoXccategoryinfoMapper;
             tWoXctaskbaseinfo.setSyncstatus(1);
             tWoXctaskbaseinfo.setfTypename("日常巡检");
            baseMapper.insert(tWoXctaskbaseinfo);
-            TSysUseraccount tSysUseraccount = tSysUseraccountMapper.selectOne(new QueryWrapper<TSysUseraccount>().lambda()
+
+            List<TSysUseraccount> tSysUseraccount = tSysUseraccountMapper.selectList(new QueryWrapper<TSysUseraccount>().lambda()
                     .eq(TSysUseraccount::getfParkid, tWoXctaskbaseinfo.getYhcompanyid()));
              twoxctaskusers = new TWoXctaskusers();
             twoxctaskusers.setfTaskid(tWoXctaskbaseinfo.getfTaskid());
-            twoxctaskusers.setfUserid(tSysUseraccount.getfUserid());
-            twoxctaskusers.setfUsername(tSysUseraccount.getfUsername());
+            if (tSysUseraccount!=null&&tSysUseraccount.size()>0)
+            {
+                twoxctaskusers.setfUserid(tSysUseraccount.get(0).getfUserid());
+                twoxctaskusers.setfUsername(tSysUseraccount.get(0).getfUsername());
+            }
             twoxctaskusers.setfState(0);
             tWoXctaskusersMapper.insert(twoxctaskusers);
 

src/main/java/com/yt/zhylplat/service/impl/TWorkReportServiceImpl.java

@@ -0,0 +1,94 @@
+package com.yt.zhylplat.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yt.zhylplat.api.response.BasePageResponse;
+import com.yt.zhylplat.base.ResultResponse;
+import com.yt.zhylplat.common.LoginUserUtil;
+import com.yt.zhylplat.entity.TWorkReport;
+import com.yt.zhylplat.dao.TWorkReportMapper;
+import com.yt.zhylplat.enums.ResultCodeEnum;
+import com.yt.zhylplat.service.TWorkReportService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author YTKJ
+ * @since 2025-11-17
+ */
+@Service
+public class TWorkReportServiceImpl extends ServiceImpl<TWorkReportMapper, TWorkReport> implements TWorkReportService {
+
+    @Override
+    public ResultResponse saveTWorkReport(TWorkReport baseRequest) {
+        TWorkReport TWorkReport = new TWorkReport();
+        BeanUtils.copyProperties(baseRequest, TWorkReport);
+        TWorkReport.setCreateTime(new Date());
+        TWorkReport.setCreateUser(LoginUserUtil.getfUsername());
+        baseMapper.insert(TWorkReport);
+        return ResultResponse.builder()
+                .status(ResultCodeEnum.SUCCESS.getCode())
+                .message(ResultCodeEnum.SUCCESS.getMessage())
+                .data(TWorkReport)
+                .build();
+    }
+
+    @Override
+    public ResultResponse updateTWorkReport(TWorkReport baseRequest) {
+        TWorkReport TWorkReport = new TWorkReport();
+        BeanUtils.copyProperties(baseRequest, TWorkReport);
+        TWorkReport.setUpdateTime(new Date());
+        baseMapper.updateById(TWorkReport);
+        return ResultResponse.builder()
+                .status(ResultCodeEnum.SUCCESS.getCode())
+                .message(ResultCodeEnum.SUCCESS.getMessage())
+                .build();
+    }
+
+    @Override
+    public ResultResponse deleteTWorkReport(Integer id) {
+        baseMapper.deleteById(id);
+        return ResultResponse.builder()
+                .status(ResultCodeEnum.SUCCESS.getCode())
+                .message(ResultCodeEnum.SUCCESS.getMessage())
+                .build();
+    }
+
+    @Override
+    public ResultResponse selectById(Integer id) {
+        return ResultResponse.builder()
+                .status(ResultCodeEnum.SUCCESS.getCode())
+                .message(ResultCodeEnum.SUCCESS.getMessage())
+                .data(baseMapper.selectById(id))
+                .build();
+    }
+
+    @Override
+    public ResultResponse pageList(Page page, TWorkReport WorkReport) {
+
+        IPage<TWorkReport> greenlandsIPage = baseMapper.selectPage(new Page<TWorkReport>(page.getCurrent(),
+                page.getSize()), new QueryWrapper<TWorkReport>().lambda()
+                .like(WorkReport.getType() != null&&WorkReport.getType()>0, TWorkReport::getType,WorkReport.getType())
+                .ge (WorkReport.getWorkStartTime() != null, TWorkReport::getWorkStartTime,WorkReport.getWorkStartTime())
+                .le (WorkReport.getWorkEndTime() != null, TWorkReport::getWorkEndTime,WorkReport.getWorkEndTime())
+                .eq  (WorkReport.getTeam() != null&& !WorkReport.getTeam().equals(""), TWorkReport::getTeam,WorkReport.getTeam())
+                .eq  (WorkReport.getSuperintendent() != null&& !WorkReport.getSuperintendent().equals(""), TWorkReport::getSuperintendent,WorkReport.getSuperintendent())
+                .orderByDesc(TWorkReport::getCreateTime)
+        );
+
+          return ResultResponse.builder()
+                .status(ResultCodeEnum.SUCCESS.getCode())
+                .message(ResultCodeEnum.SUCCESS.getMessage())
+                .data(BasePageResponse.builder().current((int) greenlandsIPage.getCurrent()).size((int) greenlandsIPage.getSize()).total((int)
+                        greenlandsIPage.getTotal()).pages((int) greenlandsIPage.getPages()).data(greenlandsIPage.getRecords()).build()).build();
+    }
+
+}

src/main/java/com/yt/zhylplat/timedTask/facilityinfo/FacilityinfoTask.java

@@ -0,0 +1,85 @@
+package com.yt.zhylplat.timedTask.facilityinfo;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yt.zhylplat.app.service.AppITBaseFacilityinfoService;
+import com.yt.zhylplat.appController.SendMessageWxController;
+import com.yt.zhylplat.dao.TBaseFacilityinfoMapper;
+import com.yt.zhylplat.dao.TSysUseraccountMapper;
+import com.yt.zhylplat.entity.TBaseFacilityinfo;
+import com.yt.zhylplat.entity.TSysUseraccount;
+import com.yt.zhylplat.entity.VwFacilityinfo;
+import com.yt.zhylplat.moduleWx.entity.TWxUserinfo;
+import com.yt.zhylplat.moduleWx.mapper.TWxUserinfoMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Scheduled;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+@Configuration
+public class FacilityinfoTask {
+    @Autowired
+    TBaseFacilityinfoMapper baseFacilityinfoMapper;
+    @Autowired
+    TWxUserinfoMapper tWxUserinfoMapper;
+    @Autowired
+    TSysUseraccountMapper tSysUseraccountMapper;
+    /**
+     * 每五分钟执行一次
+     */
+    @Scheduled(cron=" 0 0/5 * * * ? ")
+    public void sendSms() throws ParseException {
+
+        LambdaQueryWrapper<TBaseFacilityinfo> tLambdaQueryWrapper=new QueryWrapper<TBaseFacilityinfo>().lambda()
+                .ge(TBaseFacilityinfo::getExpirationTime,new Date())
+                .eq(TBaseFacilityinfo::getIsSms,0)
+                .orderByAsc(TBaseFacilityinfo::getFFacilityid)
+                ;
+        List<TBaseFacilityinfo> list = baseFacilityinfoMapper.selectList(tLambdaQueryWrapper);
+        for(TBaseFacilityinfo item :list)
+        {
+            //发送派单消息
+            try{
+
+                List<TSysUseraccount> sysUseraccounts = tSysUseraccountMapper.selectList(new
+                        QueryWrapper<TSysUseraccount>().lambda().eq(TSysUseraccount::getfDeptid, 15).
+                        eq(TSysUseraccount::getfDeleteflag, 0).eq(TSysUseraccount::getfParkid, item.getFParkid().toString()));
+
+
+                LambdaQueryWrapper<TWxUserinfo> WxtLambdaQueryWrapper = new QueryWrapper<TWxUserinfo>().lambda();
+                WxtLambdaQueryWrapper.orderByDesc(TWxUserinfo::getId);
+                WxtLambdaQueryWrapper.eq(TWxUserinfo::getDeleteFlag, 0);
+                WxtLambdaQueryWrapper.eq(TWxUserinfo::getStateFlag, 1);
+                List<Integer> collect_all = new ArrayList<>();
+                collect_all = sysUseraccounts.stream().map(TSysUseraccount::getfUserid).distinct().collect(Collectors.toList());
+                WxtLambdaQueryWrapper.in(TWxUserinfo::getUserId, collect_all);
+                List<TWxUserinfo> wxlist =tWxUserinfoMapper.selectList(WxtLambdaQueryWrapper);
+                if(wxlist!=null)
+                {
+                    if(wxlist.size()>0){
+                        for(TWxUserinfo wxmodel:wxlist){
+                            if(wxmodel.getWxOpenId()!=null) {
+                                // 微信推送消息
+                                SendMessageWxController.SendDiaryWarningFacility
+                                        (item, wxmodel.getWxOpenId(),"设施到期通知");
+                            }
+                        }
+                    }
+                }
+            }catch (Exception ex){
+            }
+        }
+
+
+    }
+}

src/main/resources/application-pro.yml

@@ -7,9 +7,9 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource  #数据源插件
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver  #zhylplatDB是数据库
-      url: jdbc:mysql://47.105.102.32:12306/zhyl_db_jz?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=Hongkong
+      url: jdbc:mysql://127.0.0.1:3306/zhyl_db_jz?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
       username: root
-      password: zhyl!@#123
+      password: hykj@800100
       #关闭 druid 连接池监控页面
       filter:
         config:

src/main/resources/application.yml

@@ -5,7 +5,7 @@
 #  port: 9090    #端口配置，每个配之前需要输入 空格
 spring:
   profiles:
-    active: dev #生产环境%测试环境
+    active: pro #生产环境%测试环境
 
   #解决 springboot 升版后文件上传问题
   mvc:
@@ -91,9 +91,9 @@ token:
 #微信小程序-智慧园林
 wx:
   #微信小程序的 appId
-  appId: wxe1c3903a345da85b
+  appId: wx97a5a9e16d2ee2fa
   #微信小程序的 appSecret
-  appSecret: 3a1b429a26bdfa5cdd6247bcd6bccb25
+  appSecret: b63bd0cd6d9c026aa2153dd088b6af23
   #事项办理进度通知模板 ID
   templateId:
 

src/main/resources/mapper/nullTEquipmentMaintenanceMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yt.zhylplat.dao.TEquipmentMaintenanceMapper">
+<mapper namespace="com.yt.zhylplat.dao.TWorkReportMapper">
 
 </mapper>

target/classes/application-pro.yml

@@ -7,9 +7,9 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource  #数据源插件
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver  #zhylplatDB是数据库
-      url: jdbc:mysql://47.105.102.32:12306/zhyl_db_jz?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=Hongkong
+      url: jdbc:mysql://127.0.0.1:3306/zhyl_db_jz?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
       username: root
-      password: zhyl!@#123
+      password: hykj@800100
       #关闭 druid 连接池监控页面
       filter:
         config:

target/classes/application.yml

@@ -5,7 +5,7 @@
 #  port: 9090    #端口配置，每个配之前需要输入 空格
 spring:
   profiles:
-    active: dev #生产环境%测试环境
+    active: pro #生产环境%测试环境
 
   #解决 springboot 升版后文件上传问题
   mvc:
@@ -91,9 +91,9 @@ token:
 #微信小程序-智慧园林
 wx:
   #微信小程序的 appId
-  appId: wxe1c3903a345da85b
+  appId: wx97a5a9e16d2ee2fa
   #微信小程序的 appSecret
-  appSecret: 3a1b429a26bdfa5cdd6247bcd6bccb25
+  appSecret: b63bd0cd6d9c026aa2153dd088b6af23
   #事项办理进度通知模板 ID
   templateId: