添加设备相关

fill-manager/db/module.sql

@@ -299,6 +299,7 @@ CREATE TABLE mortals_xhx_device_matter_datum(
     `createTime` datetime      COMMENT '创建时间',
     `createUserId` bigint(20)      COMMENT '创建用户',
     `updateTime` datetime      COMMENT '修改时间',
+    `materiaFullName` varchar(1024)      COMMENT '事项全称',
     PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备事项申请材料业务';
 

fill-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceMatterDatumEntity.java

@@ -5,7 +5,7 @@ import com.mortals.xhx.module.device.model.vo.DeviceMatterDatumVo;
  * 设备事项申请材料业务实体对象
  *
  * @author zxfei
- * @date 2023-03-23
+ * @date 2023-03-29
  */
 
 public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
@@ -63,6 +63,10 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
      * 排序
      */
     private Integer sort;
+    /**
+     * 事项全称
+     */
+    private String materiaFullName;
 
 
 
@@ -249,6 +253,20 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
     public void setSort(Integer sort){
         this.sort = sort;
     }
+    /**
+     * 获取 事项全称
+     * @return String
+     */
+    public String getMateriaFullName(){
+        return materiaFullName;
+    }
+    /**
+     * 设置 事项全称
+     * @param materiaFullName
+     */
+    public void setMateriaFullName(String materiaFullName){
+        this.materiaFullName = materiaFullName;
+    }
 
 
 
@@ -284,35 +302,38 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
         sb.append(",source:").append(getSource());
         sb.append(",isRecommend:").append(getIsRecommend());
         sb.append(",sort:").append(getSort());
+        sb.append(",materiaFullName:").append(getMateriaFullName());
         return sb.toString();
     }
 
     public void initAttrValue(){
 
-        this.siteId = null;
+        this.siteId = -1L;
 
         this.deviceId = null;
 
-        this.deviceCode = null;
+        this.deviceCode = "";
 
-        this.deviceName = null;
+        this.deviceName = "";
 
         this.matterId = null;
 
-        this.matterCode = null;
+        this.matterCode = "";
 
-        this.matterName = null;
+        this.matterName = "";
 
         this.deptId = null;
 
-        this.deptCode = null;
+        this.deptCode = "";
+
+        this.deptName = "";
 
-        this.deptName = null;
+        this.source = 0;
 
-        this.source = null;
+        this.isRecommend = 0;
 
-        this.isRecommend = null;
+        this.sort = 0;
 
-        this.sort = null;
+        this.materiaFullName = "";
     }
 }
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceMatterDatumQuery.java

@@ -6,7 +6,7 @@ import java.util.List;
  * 设备事项申请材料业务查询对象
  *
  * @author zxfei
- * @date 2023-03-23
+ * @date 2023-03-29
  */
 public class DeviceMatterDatumQuery extends DeviceMatterDatumEntity {
     /** 开始 主键，自增长 */
@@ -186,6 +186,11 @@ public class DeviceMatterDatumQuery extends DeviceMatterDatumEntity {
     /** 结束 修改时间 */
     private String updateTimeEnd;
 
+    /** 事项全称 */
+    private List<String> materiaFullNameList;
+
+    /** 事项全称排除列表 */
+    private List <String> materiaFullNameNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<DeviceMatterDatumQuery> orConditionList;
 
@@ -1179,6 +1184,38 @@ public class DeviceMatterDatumQuery extends DeviceMatterDatumEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 事项全称
+     * @return materiaFullNameList
+     */
+    public List<String> getMateriaFullNameList(){
+        return this.materiaFullNameList;
+    }
+
+    /**
+     * 设置 事项全称
+     * @param materiaFullNameList
+     */
+    public void setMateriaFullNameList(List<String> materiaFullNameList){
+        this.materiaFullNameList = materiaFullNameList;
+    }
+
+    /**
+     * 获取 事项全称
+     * @return materiaFullNameNotList
+     */
+    public List<String> getMateriaFullNameNotList(){
+        return this.materiaFullNameNotList;
+    }
+
+    /**
+     * 设置 事项全称
+     * @param materiaFullNameNotList
+     */
+    public void setMateriaFullNameNotList(List<String> materiaFullNameNotList){
+        this.materiaFullNameNotList = materiaFullNameNotList;
+    }
+
     /**
      * 设置  主键，自增长
      * @param id
@@ -1781,6 +1818,25 @@ public class DeviceMatterDatumQuery extends DeviceMatterDatumEntity {
     }
 
 
+
+    /**
+     * 设置 事项全称
+     * @param materiaFullName
+     */
+    public DeviceMatterDatumQuery materiaFullName(String materiaFullName){
+        setMateriaFullName(materiaFullName);
+        return this;
+    }
+
+    /**
+     * 设置 事项全称
+     * @param materiaFullNameList
+     */
+    public DeviceMatterDatumQuery materiaFullNameList(List<String> materiaFullNameList){
+        this.materiaFullNameList = materiaFullNameList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

fill-manager/src/main/java/com/mortals/xhx/module/home/pdu/HomeQueryPdu.java

@@ -14,4 +14,6 @@ public class HomeQueryPdu {
 
     private String title;
 
+    private String devicenum;
+
 }

fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java

@@ -30,6 +30,8 @@ import com.mortals.xhx.feign.site.ISiteFeign;
 import com.mortals.xhx.module.baseset.model.BasesetEntity;
 import com.mortals.xhx.module.baseset.model.BasesetQuery;
 import com.mortals.xhx.module.baseset.service.BasesetService;
+import com.mortals.xhx.module.device.model.DeviceMatterDatumQuery;
+import com.mortals.xhx.module.device.service.DeviceMatterDatumService;
 import com.mortals.xhx.module.home.pdu.HomeQueryPdu;
 import com.mortals.xhx.module.hotword.model.HotwordEntity;
 import com.mortals.xhx.module.hotword.model.HotwordQuery;
@@ -40,6 +42,7 @@ import com.mortals.xhx.module.matter.service.MatterDatumService;
 import com.mortals.xhx.module.matter.service.MatterService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
@@ -66,6 +69,8 @@ public class HomeController extends BaseJsonBodyController {
     private BasesetService basesetService;
     @Autowired
     private MatterDatumPrintService matterDatumPrintService;
+    @Autowired
+    private DeviceMatterDatumService deviceMatterDatumService;
 
 
     @PostMapping({"site/list"})
@@ -153,6 +158,10 @@ public class HomeController extends BaseJsonBodyController {
                 DeptPdu deptPdu = new DeptPdu();
                 deptPdu.setSiteId(queryPdu.getSiteId());
                 deptPdu.setSize(-1);
+                if(!ObjectUtils.isEmpty(queryPdu.getDevicenum())){
+                    List<Long> deptIdList = deviceMatterDatumService.find(new DeviceMatterDatumQuery().deviceCode(queryPdu.getDevicenum())).stream().map(item -> item.getDeptId()).collect(Collectors.toList());
+                    deptPdu.setIdList(deptIdList);
+                }
                 String resp = apiBaseManagerFeign.getDeptByQuery(deptPdu);
                 ApiResp<JSONObject> apiResp = JSON.parseObject(resp, ApiResp.class);
                 if (apiResp.getCode() != YesNoEnum.YES.getValue()) {
@@ -357,13 +366,6 @@ public class HomeController extends BaseJsonBodyController {
     public String appList(Long siteId) {
         String serverName = request.getHeader("server-name");
         Integer serverPort = DataUtil.converStr2Int(request.getHeader("server-port"),0);
-        log.info("host:{}",request.getRemoteHost());
-        log.info("port:{}",request.getLocalPort());
-        log.info("port1:{}",request.getServerPort());
-
-        String host = request.getHeader("Host");
-        log.info("host1:{}",host);
-
 
         log.info("【应用请求】【请求体】-->serverName{} ,port:{}",serverName ,serverPort);
         String appWhiteStr = GlobalSysInfo.getParamValue(Constant.PARAMS_WHITE_APP_LIST, "中心简介,办事指南,意见建议,通知公告");