Merge branch 'han' of uskycloud/usky-modules into server-165

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/impl/SpHj2017ServiceImpl.java

@@ -31,8 +31,6 @@ public class SpHj2017ServiceImpl extends AbstractCrudService<SpHj2017Mapper, SpH
     public List<Map<String, Object>> statusCount(String requestBody) {
         JSONObject requestVO = JSONObject.parseObject(requestBody);
         String companyCode = requestVO.get("companyCode").toString();
-        String startTimeString = requestVO.get("startTime").toString();
-        String endTimeString = requestVO.get("endTime").toString();
         Integer currentPage = (Integer) requestVO.get("current");
         Integer pageSize = (Integer) requestVO.get("size");
         int startIndex = (currentPage - 1) * pageSize;
@@ -49,25 +47,9 @@ public class SpHj2017ServiceImpl extends AbstractCrudService<SpHj2017Mapper, SpH
     public List<Map<String, Object>> typeList(String requestBody) {
         JSONObject requestVO = JSONObject.parseObject(requestBody);
         String companyCode = requestVO.get("companyCode").toString();
-        String startTimeString = requestVO.get("startTime").toString();
-        String endTimeString = requestVO.get("endTime").toString();
         QueryWrapper<SpHj2017> queryWrapper1 = Wrappers.query();
         queryWrapper1.select("COUNT(CASE WHEN clzt = 0 THEN 1 ELSE NULL END) AS untreated", "COUNT(CASE WHEN clzt = 1 THEN 1 ELSE NULL END) AS processed")
                 .inSql("device_code", "SELECT owner_code FROM sp_owner WHERE company = '" + companyCode + "' AND dwtype IN (1,3)");
-        if (StringUtils.isBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
-
-        } else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isNotBlank(endTimeString)) {
-            // 如果同时传了 startTime 和 endTime
-            queryWrapper1.between("time", startTimeString, endTimeString);
-        } else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
-            // 如果只传了 startTime
-            queryWrapper1.between("time", startTimeString, LocalDateTime.now().toString());
-        } else if (StringUtils.isNotBlank(endTimeString) && StringUtils.isBlank(startTimeString)) {
-            // 如果只传了 endTime
-            queryWrapper1.le("time", endTimeString);
-        } else {
-            throw new BusinessException("时间参数错误");
-        }
         List<Map<String, Object>> deviceStatusList1 = this.listMaps(queryWrapper1);
         return deviceStatusList1;
     }

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/impl/SpRtu2017ServiceImpl.java

@@ -32,28 +32,12 @@ public class SpRtu2017ServiceImpl extends AbstractCrudService<SpRtu2017Mapper, S
     public List<Map<String, Object>> statusCount(String requestBody) {
         JSONObject requestVO = JSONObject.parseObject(requestBody);
         String companyCode = requestVO.get("companyCode").toString();
-        String startTimeString = requestVO.get("startTime").toString();
-        String endTimeString = requestVO.get("endTime").toString();
         Integer currentPage = (Integer) requestVO.get("current");
         Integer pageSize = (Integer) requestVO.get("size");
         int startIndex = (currentPage - 1) * pageSize;
         QueryWrapper<SpRtu2017> queryWrapper = Wrappers.query();
         queryWrapper.select("DATE_FORMAT(time, '%Y-%m-%d %H:%i:%s') AS alarm_time", "data2 AS alarm_type", "data4 AS alarm_point", "device_code")
                 .inSql("device_code", "SELECT owner_code FROM sp_owner WHERE company = '" + companyCode + "' AND dwtype = 6");
-        if (StringUtils.isBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
-
-        } else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isNotBlank(endTimeString)) {
-            // 如果同时传了 startTime 和 endTime
-            queryWrapper.between("time", startTimeString, endTimeString);
-        } else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
-            // 如果只传了 startTime
-            queryWrapper.between("time", startTimeString, LocalDateTime.now().toString());
-        } else if (StringUtils.isNotBlank(endTimeString) && StringUtils.isBlank(startTimeString)) {
-            // 如果只传了 endTime
-            queryWrapper.le("time", endTimeString);
-        } else {
-            throw new BusinessException("时间参数错误");
-        }
         queryWrapper.last("LIMIT " + pageSize + " OFFSET " + startIndex)
                 .orderByDesc("id");
         List<Map<String, Object>> deviceStatusList = this.listMaps(queryWrapper);
@@ -64,25 +48,9 @@ public class SpRtu2017ServiceImpl extends AbstractCrudService<SpRtu2017Mapper, S
     public List<Map<String, Object>> typeList(String requestBody) {
         JSONObject requestVO = JSONObject.parseObject(requestBody);
         String companyCode = requestVO.get("companyCode").toString();
-        String startTimeString = requestVO.get("startTime").toString();
-        String endTimeString = requestVO.get("endTime").toString();
         QueryWrapper<SpRtu2017> queryWrapper1 = Wrappers.query();
         queryWrapper1.select("COUNT(CASE WHEN clzt = 0 THEN 1 ELSE NULL END) AS untreated", "COUNT(CASE WHEN clzt = 1 THEN 1 ELSE NULL END) AS processed")
                 .inSql("device_code", "SELECT owner_code FROM sp_owner WHERE company = '" + companyCode + "' AND dwtype = 6");
-        if (StringUtils.isBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
-
-        } else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isNotBlank(endTimeString)) {
-            // 如果同时传了 startTime 和 endTime
-            queryWrapper1.between("time", startTimeString, endTimeString);
-        } else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
-            // 如果只传了 startTime
-            queryWrapper1.between("time", startTimeString, LocalDateTime.now().toString());
-        } else if (StringUtils.isNotBlank(endTimeString) && StringUtils.isBlank(startTimeString)) {
-            // 如果只传了 endTime
-            queryWrapper1.le("time", endTimeString);
-        } else {
-            throw new BusinessException("时间参数错误");
-        }
         List<Map<String, Object>> deviceStatusList1 = this.listMaps(queryWrapper1);
         return deviceStatusList1;
     }

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/impl/SpSj2017ServiceImpl.java

@@ -30,28 +30,12 @@ public class SpSj2017ServiceImpl extends AbstractCrudService<SpSj2017Mapper, SpS
     public List<Map<String, Object>> statusCount(String requestBody) {
         JSONObject requestVO = JSONObject.parseObject(requestBody);
         String companyCode = requestVO.get("companyCode").toString();
-        String startTimeString = requestVO.get("startTime").toString();
-        String endTimeString = requestVO.get("endTime").toString();
         Integer currentPage = (Integer) requestVO.get("current");
         Integer pageSize = (Integer) requestVO.get("size");
         int startIndex = (currentPage - 1) * pageSize;
         QueryWrapper<SpSj2017> queryWrapper = Wrappers.query();
         queryWrapper.select("DATE_FORMAT(time, '%Y-%m-%d %H:%i:%s') AS alarm_time","data1 AS alarm_type","data4 AS alarm_point " ,"device_code")
                 .inSql("device_code", "SELECT owner_code FROM sp_owner WHERE company = '" + companyCode + "' AND dwtype IN (2,5)");
-        if (StringUtils.isBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
-
-        }else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isNotBlank(endTimeString)) {
-            // 如果同时传了 startTime 和 endTime
-            queryWrapper.between("time", startTimeString, endTimeString);
-        } else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
-            // 如果只传了 startTime
-            queryWrapper.between("time", startTimeString, LocalDateTime.now().toString());
-        } else if (StringUtils.isNotBlank(endTimeString)  && StringUtils.isBlank(startTimeString)) {
-            // 如果只传了 endTime
-            queryWrapper.le("time", endTimeString);
-        } else {
-            throw new BusinessException("时间参数错误");
-        }
         queryWrapper.last("LIMIT " + pageSize + " OFFSET " + startIndex)
                     .orderByDesc("id");
         List<Map<String, Object>> deviceStatusList = this.listMaps(queryWrapper);
@@ -61,25 +45,9 @@ public class SpSj2017ServiceImpl extends AbstractCrudService<SpSj2017Mapper, SpS
     public List<Map<String, Object>> typeList(String requestBody) {
         JSONObject requestVO = JSONObject.parseObject(requestBody);
         String companyCode = requestVO.get("companyCode").toString();
-        String startTimeString = requestVO.get("startTime").toString();
-        String endTimeString = requestVO.get("endTime").toString();
         QueryWrapper<SpSj2017> queryWrapper1 = Wrappers.query();
         queryWrapper1.select("COUNT(CASE WHEN clzt = 0 THEN 1 ELSE NULL END) AS untreated", "COUNT(CASE WHEN clzt = 1 THEN 1 ELSE NULL END) AS processed")
                 .inSql("device_code", "SELECT owner_code FROM sp_owner WHERE company = '" + companyCode + "' AND dwtype IN (2,5)");
-        if (StringUtils.isBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
-
-        }else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isNotBlank(endTimeString)) {
-            // 如果同时传了 startTime 和 endTime
-            queryWrapper1.between("time", startTimeString, endTimeString);
-        } else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
-            // 如果只传了 startTime
-            queryWrapper1.between("time", startTimeString, LocalDateTime.now().toString());
-        } else if (StringUtils.isNotBlank(endTimeString)  && StringUtils.isBlank(startTimeString)) {
-            // 如果只传了 endTime
-            queryWrapper1.le("time", endTimeString);
-        } else {
-            throw new BusinessException("时间参数错误");
-        }
         List<Map<String, Object>> deviceStatusList1 = this.listMaps(queryWrapper1);
         return deviceStatusList1;
     }