添加设备相关

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

@@ -131,8 +131,15 @@ public class HomeController extends BaseJsonBodyController {
         model.put("deptMap", new HashMap<>());
         try {
             if (queryPdu.getSiteId() != null) {
-                Map<String, String> deptMap = matterService.find(new MatterQuery().siteId(queryPdu.getSiteId())).stream().collect(Collectors.toMap(x -> x.getDeptCode(), y -> y.getDeptName(), (o, n) -> n));
-                model.put("deptMap", deptMap);
+                if (!ObjectUtils.isEmpty(queryPdu.getDeviceCode())) {
+                    Map<String, String> deptMap = deviceMatterDatumService.find(new DeviceMatterDatumQuery().siteId(queryPdu.getSiteId()).deviceCode(queryPdu.getDeviceCode())).stream().collect(Collectors.toMap(x -> x.getDeptCode(), y -> y.getDeptName(), (o, n) -> n));
+                    ;
+                    model.put("deptMap", deptMap);
+                    // deptPdu.setIdList(deptIdList);
+                } else {
+                    Map<String, String> deptMap = matterService.find(new MatterQuery().siteId(queryPdu.getSiteId())).stream().collect(Collectors.toMap(x -> x.getDeptCode(), y -> y.getDeptName(), (o, n) -> n));
+                    model.put("deptMap", deptMap);
+                }
             }
             model.put("message_info", busiDesc + "成功");
             this.recordSysLog(this.request, busiDesc + " 【成功】");
@@ -158,7 +165,7 @@ public class HomeController extends BaseJsonBodyController {
                 DeptPdu deptPdu = new DeptPdu();
                 deptPdu.setSiteId(queryPdu.getSiteId());
                 deptPdu.setSize(-1);
-                if(!ObjectUtils.isEmpty(queryPdu.getDeviceCode())){
+                if (!ObjectUtils.isEmpty(queryPdu.getDeviceCode())) {
                     List<Long> deptIdList = deviceMatterDatumService.find(new DeviceMatterDatumQuery().deviceCode(queryPdu.getDeviceCode())).stream().map(item -> item.getDeptId()).collect(Collectors.toList());
                     deptPdu.setIdList(deptIdList);
                 }
@@ -365,9 +372,9 @@ public class HomeController extends BaseJsonBodyController {
     @UnAuth
     public String appList(Long siteId) {
         String serverName = request.getHeader("server-name");
-        Integer serverPort = DataUtil.converStr2Int(request.getHeader("server-port"),0);
+        Integer serverPort = DataUtil.converStr2Int(request.getHeader("server-port"), 0);
 
-        log.info("【应用请求】【请求体】-->serverName{} ,port:{}",serverName ,serverPort);
+        log.info("【应用请求】【请求体】-->serverName{} ,port:{}", serverName, serverPort);
         String appWhiteStr = GlobalSysInfo.getParamValue(Constant.PARAMS_WHITE_APP_LIST, "中心简介,办事指南,意见建议,通知公告");
         Set<String> appWhiteSet = StrUtil.split(appWhiteStr, ",").stream().collect(Collectors.toSet());
         Rest<List<AppPdu>> ret = new Rest();
@@ -378,13 +385,13 @@ public class HomeController extends BaseJsonBodyController {
             appPdu.setSiteId(siteId);
             appPdu.setSize(-1);
             Rest<RespData<List<AppPdu>>> appRest = appFeign.list(appPdu);
-            String domainUrl = UrlBuilder.ofHttp(serverName).setPort(serverPort > 0 ? serverPort: 11078).build();
+            String domainUrl = UrlBuilder.ofHttp(serverName).setPort(serverPort > 0 ? serverPort : 11078).build();
             String domainUrl1 = StrUtil.sub(domainUrl, 0, domainUrl.length() - 1);
 
-            log.info("appRest:"+JSON.toJSONString(appRest));
+            log.info("appRest:" + JSON.toJSONString(appRest));
             if (appRest.getCode() == YesNoEnum.YES.getValue()) {
                 collect = appRest.getData().getData().stream().filter(f -> appWhiteSet.contains(f.getAppName()))
-                        .peek(item->{
+                        .peek(item -> {
                             item.setCustUrl(UrlBuilder.ofHttp(domainUrl1).addPath(item.getCustUrl()).build());
                             //item.setAppIconPath(UrlBuilder.ofHttp(domainUrl1).addPath(item.getAppIconPath()).build());
                             log.info(item.getCustUrl());

fill-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http

+###登录
+POST {{baseUrl}}/login/login
+Content-Type: application/json
+
+{
+"loginName":"admin",
+"password":"admin",
+"securityCode":"8888"
+}
+
+> {%
+client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
+client.global.set("authToken", JSON.parse(response.body).data.token);
+%}
+
+###设备列表
+POST {{baseUrl}}/device/list
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+    "deviceId":157,
+    "deviceName":"1e0x2f",
+    "deviceCode":"kfttm3",
+    "deviceSrc":2,
+    "deviceStatus":848,
+    "page":1,
+    "size":10
+}
+
+
+###设备更新与保存
+POST {{baseUrl}}/device/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "deviceId":213,
+        "deviceName":"o8f2uk",
+        "deviceCode":"hojug5",
+        "deviceMac":"qblxmm",
+        "siteId":624,
+        "siteCode":"vwcmg0",
+        "siteName":"1ezg8h",
+        "productCode":"gu9tca",
+        "productName":"wmia1a",
+        "deviceSrc":2,
+        "lon":"xw3n3b",
+        "lati":"296er9",
+        "leadingOfficial":"mrsrnp",
+        "leadingOfficialTelephone":"mh03sk",
+        "deviceStatus":402,
+        "deviceRemark":"ircxre",
+}
+
+> {%
+client.global.set("Device_id", JSON.parse(response.body).data.id);
+%}
+
+###设备查看
+GET {{baseUrl}}/device/info?id={{Device_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+###设备编辑
+GET {{baseUrl}}/device/edit?id={{Device_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+###设备删除
+GET {{baseUrl}}/device/delete?id={{Device_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+

fill-manager/src/test/java/com/mortals/httpclient/device/DeviceMatterDatumController.http

+###登录
+POST {{baseUrl}}/login/login
+Content-Type: application/json
+
+{
+"loginName":"admin",
+"password":"admin",
+"securityCode":"8888"
+}
+
+> {%
+client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
+client.global.set("authToken", JSON.parse(response.body).data.token);
+%}
+
+###设备事项申请材料业务列表
+POST {{baseUrl}}/device/matter/datum/list
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+    "deviceCode":"ayeliw",
+    "siteId":969,
+    "page":1,
+    "size":10
+}
+
+
+###设备事项申请材料业务更新与保存
+POST {{baseUrl}}/device/matter/datum/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "deviceId":774,
+        "deviceCode":"cq4ted",
+        "deviceName":"ivgx2j",
+        "productId":60,
+        "productCode":"r76xdx",
+        "productName":"l3ojgr",
+        "matterId":487,
+        "siteId":572,
+        "deptId":798,
+        "deptCode":"tpqg1i",
+        "deptName":"bpo2fi",
+        "materialName":"9na5yj",
+        "materiaFullName":"jf6xja",
+        "source":741,
+        "isRecommend":229,
+        "total":720,
+        "sort":851,
+}
+
+> {%
+client.global.set("DeviceMatterDatum_id", JSON.parse(response.body).data.id);
+%}
+
+###设备事项申请材料业务查看
+GET {{baseUrl}}/device/matter/datum/info?id={{DeviceMatterDatum_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+###设备事项申请材料业务编辑
+GET {{baseUrl}}/device/matter/datum/edit?id={{DeviceMatterDatum_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+###设备事项申请材料业务删除
+GET {{baseUrl}}/device/matter/datum/delete?id={{DeviceMatterDatum_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+