Merge remote-tracking branch 'origin/V0.0.4' into V0.0.4

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteConfigFallbackFactory.java

@@ -17,12 +17,12 @@ public class RemoteConfigFallbackFactory implements FallbackFactory<RemoteConfig
         return new RemoteConfigService() {
             @Override
             public R<SysConfig> findFirstByCode(String code, String source) {
-                return null;
+                return R.fail();
             }
 
             @Override
             public SysConfig findSysConfigByCode(String code, String source) {
-                return null;
+                return new SysConfig();
             }
         };
     }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteCoreEvaluatePlanFallbackFactory.java

@@ -21,7 +21,7 @@ public class RemoteCoreEvaluatePlanFallbackFactory implements FallbackFactory<Re
         return new RemoteCoreEvaluatePlanService() {
             @Override
             public AjaxResult generate(String cycle, String source) {
-                return null;
+                return AjaxResult.error();
             }
         };
     }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteDeviceFallbackFactory.java

@@ -23,7 +23,7 @@ public class RemoteDeviceFallbackFactory implements FallbackFactory<RemoteDevice
         return new RemoteDeviceService() {
             @Override
             public SysDevice getInfoById(Long id, String source) {
-                return null;
+                return new SysDevice();
             }
         };
     }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteDrillFallbackFactory.java

@@ -17,6 +17,6 @@ public class RemoteDrillFallbackFactory implements FallbackFactory<RemoteDrillFa
 
     @Override
     public RemoteDrillFallbackFactory create(Throwable cause) {
-        return null;
+        return new RemoteDrillFallbackFactory();
     }
 }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteEduTrainingFallbackFactory.java

@@ -1,11 +1,14 @@
 package com.xunmei.system.api.factory;
 
+import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.system.api.RemoteEduTrainingService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 /**
  * 字典服务降级处理
  *
@@ -18,6 +21,21 @@ public class RemoteEduTrainingFallbackFactory implements FallbackFactory<RemoteE
 
     @Override
     public RemoteEduTrainingService create(Throwable cause) {
-        return null;
+        return new RemoteEduTrainingService() {
+            @Override
+            public AjaxResult buildEduTask(Integer cycle, Date date) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult updateEduTaskStatus() {
+                return null;
+            }
+
+            @Override
+            public AjaxResult rebuild(String event, String source) {
+                return null;
+            }
+        };
     }
 }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteFileFallbackFactory.java

@@ -37,23 +37,23 @@ public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileServ
             @Override
             public R<String> generateEduTrainingPdf(Map<String, Object> data) {
                 log.error("生成教育培训登记簿失败:{},参数:{}", throwable.getMessage(), JSON.toJSONString(data));
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<String> generateResumptionPdf(Map<String, Object> data) {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<String> generateSafeCheckPdf(SafeCheckTaskRegisterBookVo data) {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<String> generateDrillPdf(Map<String, Object> data) {
                 log.error("生成预案演练登记簿失败:{},参数:{}", throwable.getMessage(), JSON.toJSONString(data));
-                return null;
+                return R.fail();
             }
 
             @Override

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteJobFallbackFactory.java

@@ -21,12 +21,12 @@ public class RemoteJobFallbackFactory implements FallbackFactory<RemoteJobServic
 
             @Override
             public AjaxResult remoteAdd(SysJobDTO sysJobDTO, String source) {
-                return null;
+                return AjaxResult.error();
             }
 
             @Override
             public AjaxResult remoteRemove(Long[] jobIds, String source) {
-                return null;
+                return AjaxResult.error();
             }
         };
     }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteOrgFallbackFactory.java

@@ -41,7 +41,7 @@ public class RemoteOrgFallbackFactory implements FallbackFactory<RemoteOrgServic
 
             @Override
             public List<Long> selectCheckSubOrgIdList(Long orgId, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
@@ -51,42 +51,42 @@ public class RemoteOrgFallbackFactory implements FallbackFactory<RemoteOrgServic
 
             @Override
             public List<SysOrg> selectSysOrgByParentId(Long id, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
             public List<SysOrg> selectSysOrgByPathAndType(String path, Integer type, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
             public List<SysOrg> selectSysOrgByParentIds( List<Long> parentIds,String source){
-                return  null;
+                return  new ArrayList<>();
             }
 
             @Override
             public R<List<SysOrg>> listByIds(List<Long> ids, String source) {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<List<Long>> findListByOrgType(Integer execOrgType, String source) {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<Boolean> batchSaveSyncOrg(List<SysOrg> orgList, String source) {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<List<SysOrg>> listByTypes(OrgListByTypesConditionEto eto) {
-                return null;
+                return R.fail();
             }
 
             @Override
             public List<SysOrg> listByParentIdAndType(SysOrg sysOrg, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
@@ -136,12 +136,12 @@ public class RemoteOrgFallbackFactory implements FallbackFactory<RemoteOrgServic
 
             @Override
             public List<Long> selectOrgTypeByIdList(List<Long> ids, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
             public List<SysOrg> findAllOrg(String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
@@ -161,18 +161,18 @@ public class RemoteOrgFallbackFactory implements FallbackFactory<RemoteOrgServic
 
             @Override
             public List<SysOrg> findByOrgTypeAndParent(Integer orgType, String path, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
             public R<List<SysOrgVO>> hangsheWholePathTree(Long orgId,@RequestHeader(SecurityConstants.FROM_SOURCE) String source) {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<OrgTreeResp>  getOrgTreeResp(OrgTreeReq orgTreeReq) {
                 log.error("获取机构树失败:{}", throwable.getMessage());
-                return null;
+                return R.fail();
             }
 
             @Override
@@ -182,19 +182,19 @@ public class RemoteOrgFallbackFactory implements FallbackFactory<RemoteOrgServic
 
             @Override
             public List<SysOrg> findByOrgTypesAndParent(FindOrgTypes types, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
 
 
             public List<SysOrg> selectOrgTreeListByCurOrgId(Long id, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
             public List<SysOrg> selectOrgByPath(Long orgId) {
-                return null;
+                return new ArrayList<>();
             }
         };
     }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteProtectionFallbackFactory.java

@@ -24,7 +24,7 @@ public class RemoteProtectionFallbackFactory implements FallbackFactory<RemotePr
 
             @Override
             public AjaxResult addByDevice(ProtectionDTO editDto, String source) {
-                return null;
+                return AjaxResult.error();
             }
 
             @Override

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteResumptionTaskFallbackFactory.java

@@ -33,7 +33,7 @@ public class RemoteResumptionTaskFallbackFactory implements FallbackFactory<Remo
              */
             @Override
             public R<Boolean> dayTask() {
-                return null;
+                return R.fail();
             }
 
             /**
@@ -43,7 +43,7 @@ public class RemoteResumptionTaskFallbackFactory implements FallbackFactory<Remo
              */
             @Override
             public R<Boolean> weekTask() {
-                return null;
+                return R.fail();
             }
 
             /**
@@ -53,22 +53,22 @@ public class RemoteResumptionTaskFallbackFactory implements FallbackFactory<Remo
              */
             @Override
             public R<Boolean> monthTask() {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<Boolean> updateTaskStatus() {
-                return null;
+                return R.fail();
             }
 
             @Override
             public AjaxResult rebuild(String event, String source) {
-                return null;
+                return AjaxResult.error();
             }
 
             @Override
             public AjaxResult buildPdf() {
-                return null;
+                return AjaxResult.error();
             }
 
 

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteRoleFallbackFactory.java

@@ -11,6 +11,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -34,7 +35,7 @@ public class RemoteRoleFallbackFactory implements FallbackFactory<RemoteRoleServ
 
             @Override
             public List<SysRole> getRoleByUserId(Long userId, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
@@ -44,17 +45,17 @@ public class RemoteRoleFallbackFactory implements FallbackFactory<RemoteRoleServ
 
             @Override
             public List<IdNameVo> getNames(RoleConditionEto condition) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
             public List<SysUser> selectUserByRoleNameAndOrgId(String roleName, Long orgId, Integer isLock,String inner) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
             public List<Long> getUserRoleId(Long userId, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteSafetyCheckTaskFallbackFactory.java

@@ -12,42 +12,42 @@ public class RemoteSafetyCheckTaskFallbackFactory implements FallbackFactory<Rem
         return new RemoteSafetyCheckService() {
             @Override
             public R<Boolean> dayTask() {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<Boolean> weekTask() {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<Boolean> monthTask() {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<Boolean> quarterTask() {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<Boolean> halfYearTask() {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<Boolean> yearTask() {
-                return null;
+                return R.fail();
             }
 
             @Override
             public AjaxResult rebuild(String event, String source) {
-                return null;
+                return AjaxResult.error();
             }
 
             @Override
             public R<Boolean> updateTaskStatus() {
-                return null;
+                return R.fail();
             }
         };
     }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteUserFallbackFactory.java

@@ -73,12 +73,12 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
 
             @Override
             public List<SysUser> userListByRoleAndOrg(SysPlanOrgDTO sysRoleOrgDTO, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
             public  List<IdNameVo> getRoleInfoOfUser(@PathVariable Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source){
-                return null;
+                return new ArrayList<>();
             }
         };
     }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteWeatherFallbackFactory.java

@@ -20,7 +20,7 @@ public class RemoteWeatherFallbackFactory implements FallbackFactory<RemoteWeath
         {
             @Override
             public AjaxResult getDataFromApi(String source) {
-                return null;
+                return AjaxResult.error();
             }
         };
     }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteWorkTimesFallbackFactory.java

@@ -10,6 +10,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -40,7 +41,7 @@ public class RemoteWorkTimesFallbackFactory implements FallbackFactory<RemoteWor
 
             @Override
             public List<String> findWorkTimeByDateRangeAndOrgId(Date startTime, Date endTime, Long orgId) {
-                return null;
+                return new ArrayList<>();
             }
             @Override
             public R<List<SysWorkTime>> findWorkTimeByRange(WorkTimeDto workTimeDto,String source) {
@@ -59,7 +60,7 @@ public class RemoteWorkTimesFallbackFactory implements FallbackFactory<RemoteWor
 
             @Override
             public List<SysWorkTime> getWorkTime(Map<String, Object> searchData, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/worktime/domain/SysWorkTime.java

@@ -159,7 +159,7 @@ public class SysWorkTime extends BaseEntity {
     /**
      * 年月日
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty(value = "年月日")
     private Date ymdDate;
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/utils/file/ImageUtils.java

@@ -30,7 +30,7 @@ public class ImageUtils
         catch (Exception e)
         {
             log.error("图片加载异常 {}", e);
-            return null;
+            return new byte[0];
         }
         finally
         {
@@ -76,7 +76,7 @@ public class ImageUtils
         catch (Exception e)
         {
             log.error("访问文件异常 {}", e);
-            return null;
+            return new byte[0];
         }
         finally
         {

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/utils/ip/IpUtils.java

@@ -136,7 +136,7 @@ public class IpUtils
     {
         if (text.length() == 0)
         {
-            return null;
+            return new byte[0];
         }
 
         byte[] bytes = new byte[4];
@@ -151,7 +151,7 @@ public class IpUtils
                     l = Long.parseLong(elements[0]);
                     if ((l < 0L) || (l > 4294967295L))
                     {
-                        return null;
+                        return new byte[0];
                     }
                     bytes[0] = (byte) (int) (l >> 24 & 0xFF);
                     bytes[1] = (byte) (int) ((l & 0xFFFFFF) >> 16 & 0xFF);
@@ -162,13 +162,13 @@ public class IpUtils
                     l = Integer.parseInt(elements[0]);
                     if ((l < 0L) || (l > 255L))
                     {
-                        return null;
+                        return new byte[0];
                     }
                     bytes[0] = (byte) (int) (l & 0xFF);
                     l = Integer.parseInt(elements[1]);
                     if ((l < 0L) || (l > 16777215L))
                     {
-                        return null;
+                        return new byte[0];
                     }
                     bytes[1] = (byte) (int) (l >> 16 & 0xFF);
                     bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF);
@@ -180,14 +180,14 @@ public class IpUtils
                         l = Integer.parseInt(elements[i]);
                         if ((l < 0L) || (l > 255L))
                         {
-                            return null;
+                            return new byte[0];
                         }
                         bytes[i] = (byte) (int) (l & 0xFF);
                     }
                     l = Integer.parseInt(elements[2]);
                     if ((l < 0L) || (l > 65535L))
                     {
-                        return null;
+                        return new byte[0];
                     }
                     bytes[2] = (byte) (int) (l >> 8 & 0xFF);
                     bytes[3] = (byte) (int) (l & 0xFF);
@@ -198,18 +198,18 @@ public class IpUtils
                         l = Integer.parseInt(elements[i]);
                         if ((l < 0L) || (l > 255L))
                         {
-                            return null;
+                            return new byte[0];
                         }
                         bytes[i] = (byte) (int) (l & 0xFF);
                     }
                     break;
                 default:
-                    return null;
+                    return new byte[0];
             }
         }
         catch (NumberFormatException e)
         {
-            return null;
+            return new byte[0];
         }
         return bytes;
     }

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/utils/sign/Base64.java

@@ -163,7 +163,7 @@ public final class Base64
     {
         if (encoded == null)
         {
-            return null;
+            return new byte[0];
         }
 
         char[] base64Data = encoded.toCharArray();
@@ -172,7 +172,8 @@ public final class Base64
 
         if (len % FOURBYTE != 0)
         {
-            return null;// should be divisible by four
+            return new byte[0];
+            // should be divisible by four
         }
 
         int numberQuadruple = (len / FOURBYTE);
@@ -224,9 +225,10 @@ public final class Base64
         {// Check if they are PAD characters
             if (isPad(d3) && isPad(d4))
             {
-                if ((b2 & 0xf) != 0)// last 4 bits should be zero
+                if ((b2 & 0xf) != 0)
+                    // last 4 bits should be zero
                 {
-                    return null;
+                    return new byte[0];
                 }
                 byte[] tmp = new byte[i * 3 + 1];
                 System.arraycopy(decodedData, 0, tmp, 0, i * 3);
@@ -236,9 +238,10 @@ public final class Base64
             else if (!isPad(d3) && isPad(d4))
             {
                 b3 = base64Alphabet[d3];
-                if ((b3 & 0x3) != 0)// last 2 bits should be zero
+                if ((b3 & 0x3) != 0)
+                    // last 2 bits should be zero
                 {
-                    return null;
+                    return new byte[0];
                 }
                 byte[] tmp = new byte[i * 3 + 2];
                 System.arraycopy(decodedData, 0, tmp, 0, i * 3);
@@ -248,7 +251,7 @@ public final class Base64
             }
             else
             {
-                return null;
+                return new byte[0];
             }
         }
         else

soc-common/soc-common-security/src/main/java/com/xunmei/common/security/utils/DictUtils.java

@@ -7,6 +7,7 @@ import com.xunmei.common.redis.utils.RedisUtils;
 import com.xunmei.system.api.domain.SysDictData;
 import io.netty.util.internal.StringUtil;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -35,12 +36,10 @@ public class DictUtils {
      */
     public static List<SysDictData> getDictCache(String key) {
         List<SysDictData> arrayCache = RedisUtils.getCacheObject(getCacheKey(key));
-        //JSONArray arrayCache = SpringUtils.getBean(RedisService.class).getCacheObject(getCacheKey(key));
         if (StringUtils.isNotNull(arrayCache)) {
-//            return arrayCache.toList(SysDictData.class);
             return arrayCache;
         }
-        return null;
+        return new ArrayList<>();
     }
 
     /**
@@ -50,7 +49,6 @@ public class DictUtils {
      */
     public static void removeDictCache(String key) {
         RedisUtils.deleteObject(getCacheKey(key));
-//        SpringUtils.getBean(RedisService.class).deleteObject(getCacheKey(key));
     }
 
     /**
@@ -58,8 +56,6 @@ public class DictUtils {
      */
     public static void clearDictCache() {
         RedisUtils.deleteByPrefix(CacheConstants.SYS_DICT_KEY);
-//        Collection<String> keys = SpringUtils.getBean(RedisService.class).keys(CacheConstants.SYS_DICT_KEY + "*");
-//        SpringUtils.getBean(RedisService.class).deleteObject(keys);
     }
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/controller/CoreEvaluateTaskController.java

@@ -18,6 +18,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
 
@@ -58,7 +59,11 @@ public class CoreEvaluateTaskController extends BaseController {
     @RequiresPermissions("core:evaluateTask:list")
     @GetMapping("/statistics")
     public AjaxResult statistics(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
-        return success(coreEvaluateTaskService.statistics(evaluateTaskStatisticsDTO));
+        AjaxResult ajaxResult =AjaxResult.success();
+        ajaxResult.put(AjaxResult.DATA_TAG,coreEvaluateTaskService.statistics(evaluateTaskStatisticsDTO));
+        LocalDate localDate= LocalDate.now();
+        ajaxResult.put("tittle","押运公司评价情况表("+localDate.getYear()+"年"+localDate.getMonthValue()+"月)");
+        return ajaxResult;
     }
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -104,49 +104,6 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         return TableDataInfo.build(page);
     }
 
-    private Map beiyong(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
-/*    Map map = new HashMap();
-    Page<Map> page;
-    //分页
-    if (evaluateTaskStatisticsDTO.getPageNum() != null && evaluateTaskStatisticsDTO.getPageSize() != null) {
-        page = new Page<>(evaluateTaskStatisticsDTO.getPageNum(), evaluateTaskStatisticsDTO.getPageSize());
-    } else {
-        page = new Page<>();
-    }
-    SysOrg sysOrg = remoteOrgService.selectSysOrgById(evaluateTaskStatisticsDTO.getOrgId(), SecurityConstants.INNER);
-    evaluateTaskStatisticsDTO.setOrgPath(sysOrg.getPath());
-    if (sysOrg.getType().equals(1)) {
-        evaluateTaskStatisticsDTO.setType(3);
-    } else {
-        evaluateTaskStatisticsDTO.setType(4);
-    }
-    evaluateTaskStatisticsDTO.setOrgId(null);
-    evaluateTaskStatisticsDTO.setOrgPath(null);
-  //  List<LinkedHashMap> rows = baseMapper.statisticsAll(evaluateTaskStatisticsDTO);
-    Integer average = 0;
-    Integer all = 0;
-    for (int i = 0; i < rows.size(); i++) {
-        Object id = rows.get(i).get("id");
-        rows.get(i).remove("id");
-        List<Map> contentByTaskId = baseMapper.getContentByTaskId((Long) id);
-        if (CollectionUtils.isNotEmpty(contentByTaskId)) {
-            int total = 0;
-            for (int l = 0; l < contentByTaskId.size(); l++) {
-                Double score = Double.valueOf(contentByTaskId.get(l).get("score").toString());
-                total += score;
-            }
-            rows.get(i).put("评价得分", total);
-            all += total;
-        }
-    }
-    map.put("list", rows);
-    if (rows.size() > 0) {
-        average = all / rows.size();
-    }
-    map.put("average", average);
-    return map;*/
-        return null;
-    }
 
     @Override
     public Map statistics(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/monitor/service/impl/MonitorAccessReportServiceImpl.java

@@ -93,8 +93,8 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
 
     @Override
     public List<MonitoringAccessVO> selectAll(MonitoringAccessDTO monitoringAccessDTO) {
-        monitoringAccessDTO.setStartDate(monitoringAccessDTO.getStartDate()+" 00:00:00");
-        monitoringAccessDTO.setEndDate(monitoringAccessDTO.getEndDate()+" 23:59:59");
+        monitoringAccessDTO.setStartDate(monitoringAccessDTO.getStartDate() + " 00:00:00");
+        monitoringAccessDTO.setEndDate(monitoringAccessDTO.getEndDate() + " 23:59:59");
         if (null == monitoringAccessDTO.getOrgId()) {
             monitoringAccessDTO.setOrgId(SecurityUtils.getLoginUser().getOrgId());
         }
@@ -120,7 +120,7 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
                     sysOrg1 = remoteOrgService.selectOrgById(remoteOrgService.selectOrgById(remoteOrgService.selectOrgById(s.getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER);
                 }
             }
-            monitoringAccessVO.setCity(sysOrg1.getShortName().indexOf("地区行社")==-1?sysOrg1.getShortName().substring(0,2):sysOrg1.getShortName().split("地区行社")[0]);
+            monitoringAccessVO.setCity(sysOrg1.getShortName().indexOf("地区行社") == -1 ? sysOrg1.getShortName().substring(0, 2) : sysOrg1.getShortName().split("地区行社")[0]);
             Integer integer = monitorAccessReportMapper.selectNetworkNumberByPath(s.getPath());
             monitoringAccessDTO.setOrgPath(s.getPath());
             MonitoringAccessVO monitoringAccessVO1 = monitorAccessReportMapper.selectAll(monitoringAccessDTO);
@@ -169,7 +169,17 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
             monitoringAccessDTO.setOrgId(SecurityUtils.getLoginUser().getOrgId());
         }
         SysOrg sysOrg = remoteOrgService.selectSysOrgById(monitoringAccessDTO.getOrgId(), SecurityConstants.INNER);
-        String title = sysOrg.getShortName() + "监控调阅情况表" + "(" + monitoringAccessDTO.getStartDate().split(" ")[0] + "~" + monitoringAccessDTO.getEndDate().split(" ")[0] + ")";
+        String st = null;
+        String en = null;
+        try {
+            Date date = new SimpleDateFormat("yyyy-MM-dd").parse(monitoringAccessDTO.getStartDate().split(" ")[0]);
+            st = new SimpleDateFormat("yyyy年MM月dd日").format(date);
+            Date date1 = new SimpleDateFormat("yyyy-MM-dd").parse(monitoringAccessDTO.getEndDate().split(" ")[0]);
+            en = new SimpleDateFormat("yyyy年MM月dd日").format(date1);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        String title = sysOrg.getShortName() + "监控调阅情况表" + "(" + st + "~" + en + ")";
         return title;
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/gx/service/ResumptionService.java

@@ -10,13 +10,6 @@ import java.util.Map;
 public interface ResumptionService {
 
 
-    /**
-     * 根据日期获取履职数据
-     * @param dto
-     * @return
-     */
-    Map<String, List<ResumptionTaskListVo>> getTaskList(ResumptionTaskNewDto dto);
-
 
     /**
      * 根据任务id，获取当前任务的具体详情

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/gx/service/ResumptionServiceImpl.java

@@ -61,22 +61,6 @@ public class ResumptionServiceImpl implements ResumptionService {
     @Autowired
     private AppPlanService appPlanService;
 
-    @Override
-    public Map<String, List<ResumptionTaskListVo>> getTaskList(ResumptionTaskNewDto dto) {
-
-        Date dateTime = dto.getDateTime();
-        if (dateTime == null) {
-            dateTime = new Date();
-            dto.setDateTime(dateTime);
-        }
-
-        /*
-         *根据机构id，角色权限，日期，获取对应的履职任务数据
-         */
-
-
-        return null;
-    }
 
     @Override
     public ResumptionTaskDetailVo getTask(ResumptionTaskDetailVo taskDetailVo) throws Exception {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -752,7 +752,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         List<Map<String, Object>> list = new ArrayList<>();
 
         if (info.getOrgType() == null && info.getOrgId() == null) {
-            return null;
+            return new ArrayList<>();
         }
         QueryWrapper<AppRule> qw = new QueryWrapper<>();
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -97,10 +97,6 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
 
     @Override
     public TableDataInfo selectPage(RetrievalTaskPageDto request) {
-        CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO=new CoreMonitoringTaskRegistrationDTO();
-        coreMonitoringTaskRegistrationDTO.setMoth("2023-11");
-        coreMonitoringTaskRegistrationDTO.setOrgId(1703700546288824647L);
-        selectListApp(coreMonitoringTaskRegistrationDTO);
         Page<CoreMonitoringRetrievalTaskVo> page;
         //分页
         if (request.getPageNum() != null && request.getPageSize() != null) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/weather/utils/HttpUtils.java

@@ -118,7 +118,7 @@ public class HttpUtils {
             //返回受信任的x509证书数组
             @Override
             public X509Certificate[] getAcceptedIssuers() {
-                return null;
+                return new X509Certificate[0];
             }
         }};
         return trustManagers;

soc-modules/soc-modules-job/src/main/java/com/xunmei/job/util/JobInvokeUtil.java

@@ -6,6 +6,7 @@ import com.xunmei.job.domain.SysJob;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -109,7 +110,7 @@ public class JobInvokeUtil
         String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")");
         if (StringUtils.isEmpty(methodStr))
         {
-            return null;
+            return new ArrayList<>();
         }
         String[] methodParams = methodStr.split(",(?=([^\"']*[\"'][^\"']*[\"'])*[^\"']*$)");
         List<Object[]> classs = new LinkedList<>();

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysAreaCheckController.java

@@ -125,10 +125,10 @@ public class SysAreaCheckController extends BaseController {
     @GetMapping(value = "/getAreaCheckInfoByOrg/{orgId}")
     public AjaxResult getAreaCheckInfoByOrg(@PathVariable(value = "orgId", required = false) Long orgId) {
         AjaxResult ajax = AjaxResult.success();
-        SysOrg sysOrg = sysOrgMapper.selectSysOrgById(orgId);
+   /*     SysOrg sysOrg = sysOrgMapper.selectSysOrgById(orgId);
         if (null == sysOrg.getType()) {
             return error("该机构没有机构类型，请维护！");
-        }
+        }*/
         List<SysAreaCheck> sysAreaChecks = sysAreaCheckService.selectByOrgId(orgId);
         ajax.put(AjaxResult.DATA_TAG, sysAreaChecks);
         return ajax;

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysAreaController.java

@@ -66,10 +66,10 @@ public class SysAreaController extends BaseController {
     @RequiresPermissions("system:area:query")
     @GetMapping("/getAreaByOrg/{orgId}")
     public AjaxResult getAreaByOrg(@PathVariable("orgId") Long orgId) {
-        SysOrg sysOrg = sysOrgMapper.selectSysOrgById(orgId);
+ /*       SysOrg sysOrg = sysOrgMapper.selectSysOrgById(orgId);
         if (null==sysOrg.getType()){
          return error("该机构没有机构类型，请维护！");
-        }
+        }*/
         return success(sysAreaService.getAreaByOrg(orgId));
     }
     /**

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDeptController.java

@@ -2,6 +2,10 @@ package com.xunmei.system.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import com.alibaba.excel.write.builder.ExcelWriterBuilder;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xunmei.common.core.constant.Constants;
@@ -29,6 +33,7 @@ import com.xunmei.system.service.ISysDeptService;
 import com.xunmei.system.service.ISysOrgService;
 import com.xunmei.system.service.ISysUserService;
 import com.xunmei.system.util.ConstructionDetailExport;
+import com.xunmei.system.util.CustomerTitleHandler;
 import com.xunmei.system.util.OrgPhysicalDefenseConstructionExport;
 import com.xunmei.system.util.SecurityUserExport;
 import io.swagger.annotations.ApiOperation;
@@ -38,6 +43,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.Writer;
 import java.net.URLEncoder;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -65,6 +72,7 @@ public class SysDeptController extends BaseController {
     public TableDataInfo<SysOrg> list(SysOrg dept) {
         return orgService.selectPage(dept);
     }
+
     @RequiresPermissions("system:dept:exportConstructionDetails")
     @PostMapping("/exportConstructionDetails")
     public void exportConstructionDetails(SysOrg dept, HttpServletResponse response) {
@@ -117,8 +125,7 @@ public class SysDeptController extends BaseController {
             response.setContentType("application/octet-stream;charset=UTF-8");
             response.setCharacterEncoding("utf-8");
             // 数据导出
-            EasyExcel.write(response.getOutputStream(), OrgPhysicalDefenseConstructionExport.class)
-                    .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).sheet("用户数据").doWrite(excel);
+            EasyExcel.write(response.getOutputStream(), OrgPhysicalDefenseConstructionExport.class).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).sheet("用户数据").doWrite(excel);
         } catch (Exception e) {
             // 重置response
             response.reset();
@@ -127,6 +134,7 @@ public class SysDeptController extends BaseController {
         }
 
     }
+
     /**
      * 查询机构列表（排除节点）
      */

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysOrgController.java

@@ -181,7 +181,7 @@ public class SysOrgController extends BaseController {
     public List<Long> getUpOrgs(@PathVariable("orgId") Long orgId) {
         SysOrg org=sysOrgMapper.selectById(orgId);
         if(ObjectUtil.isNull(org)){
-            return  null;
+            return  new ArrayList<>();
         }
         String path = org.getPath();
         if (ObjectUtil.isEmpty(path)) {

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysDictTypeServiceImpl.java

@@ -103,7 +103,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
             DictUtils.setDictCache(dictType, dictDatas);
             return dictDatas;
         }
-        return null;
+        return new ArrayList<>();
     }
 
     @Override

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/CustomerTitleHandler.java

@@ -0,0 +1,54 @@
+package com.xunmei.system.util;
+
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.write.handler.CellWriteHandler;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
+import com.alibaba.nacos.common.utils.CollectionUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.springframework.util.PropertyPlaceholderHelper;
+
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/11/28
+ */
+public class CustomerTitleHandler implements CellWriteHandler {
+    private String title;
+    PropertyPlaceholderHelper placeholderHelper = new PropertyPlaceholderHelper("${", "}");
+    public CustomerTitleHandler(String title) {
+        this.title = title;
+    }
+
+    @Override
+    public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row, Head head, Integer integer, Integer integer1, Boolean aBoolean) {
+        if (head==null) {
+            List<String> headNameList = head.getHeadNameList();
+            if (CollectionUtils.isNotEmpty(headNameList)) {
+                Properties properties = new Properties();
+                properties.setProperty("title", title);
+                headNameList.set(0, placeholderHelper.replacePlaceholders(headNameList.get(0), properties));
+            }
+        }
+
+    }
+
+    @Override
+    public void afterCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Cell cell, Head head, Integer integer, Boolean aBoolean) {
+
+    }
+
+    @Override
+    public void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, CellData cellData, Cell cell, Head head, Integer integer, Boolean aBoolean) {
+
+    }
+
+    @Override
+    public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, List<CellData> list, Cell cell, Head head, Integer integer, Boolean aBoolean) {
+
+    }
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/SecurityWorkExport.java

@@ -0,0 +1,122 @@
+package com.xunmei.system.util;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+/**
+ * 安全保卫工作情况统计
+ * @author :LuoWei
+ * @date : 2023/11/29
+ */
+@Data
+@ColumnWidth(15) //列宽,最大值为255
+@HeadRowHeight(16) //表头行高
+@ContentRowHeight(16) //数据行高
+public class SecurityWorkExport {
+    @ExcelProperty(value = "序号", index = 0)
+    @TableField(exist = false)
+    private String xh;
+    @ExcelProperty(value = "地区", index = 1)
+    private String city;
+    @ExcelProperty(value = "单位", index = 2)
+    private String orgName;
+    @ExcelProperty(value = "营业网点总量", index = 3)
+    private Integer networkNumber;
+    @ExcelProperty(value = "营业网点达标数量（符合GA38-2015、2021标准）", index = 4)
+    private Integer reachNumber;
+    @ExcelProperty(value = "自有产权网点数", index = 5)
+private Integer ownPropertyNumber;
+    @ExcelProperty(value = "区域外网点数", index = 6)
+    private Integer areaOutsideNumber;
+    @ExcelProperty(value = "业务库总量", index = 7)
+    private Integer businessLibraryTotal;
+    @ExcelProperty(value = "一类库", index = 7)
+    private Integer oneLibrary;
+    @ExcelProperty(value = "二类库", index = 7)
+    private Integer twoLibrary;
+    @ExcelProperty(value = "三类库", index = 7)
+    private Integer threeLibrary;
+    @ExcelProperty(value = "四类库", index = 7)
+    private Integer fourLibrary;
+    @ExcelProperty(value = "保管箱库", index = 7)
+    private Integer collectLibrary;
+    @ExcelProperty(value = "在行式总量", index = 7)
+   private Integer  onLineTotal;
+    @ExcelProperty(value = "在行式达标数量（符合GA38-2021标准）", index = 7)
+    private Integer onLineReachNumber;
+    @ExcelProperty(value = "离行式总量", index = 7)
+    private Integer departureTotal;
+    @ExcelProperty(value = "离行式达标数量（符合GA38-2021标准）", index = 7)
+    private Integer departureReachNumber;
+    @ExcelProperty(value = "自助设备总数", index = 7)
+   private Integer  selfServiceDevicesTotal;
+    @ExcelProperty(value = "在行大堂式机具", index = 7)
+    private Integer  onLineLobbyImplement;
+    @ExcelProperty(value = "在行式穿墙式机具", index = 7)
+    private Integer   onLineThroughWalls;
+    @ExcelProperty(value = "离行式大堂式机具", index = 7)
+  private Integer  departureLobbyImplement;
+    @ExcelProperty(value = "离行式穿墙式机具", index = 7)
+ private Integer    departureThroughWalls;
+    @ExcelProperty(value = "中心建设时间（年）", index = 7)
+   private String centerConstructionTime;
+    @ExcelProperty(value = "监控平台最近一次升级改造时间（年", index = 7)
+    private String transformTime;
+    @ExcelProperty(value = "监控中心平台品牌", index = 7)
+    private String brand;
+    @ExcelProperty(value = "视频监控摄像头总路数", index = 7)
+    private Integer cameraTotal;
+    @ExcelProperty(value = "是否实现远程控制和实时授权的功能", index = 7)
+   private String remoteControl;
+    @ExcelProperty(value = "本地值守网点数量(由员工进行同楼异地值守)", index = 7)
+    private Integer localDutyNetworkNumber;
+    @ExcelProperty(value = "异地值守网点数量（由监控中心进行远程值守）", index = 7)
+    private Integer remoteDutyNetworkNumber;
+    @ExcelProperty(value = "监控中心安保卫持证人数", index = 7)
+    private Integer certificatePeopleNumber;
+    @ExcelProperty(value = "人员合计", index = 7)
+    private Integer certificateTotal;
+    @ExcelProperty(value = "其中，内部保安人数（含派遣）", index = 7)
+    private Integer internalCertificateNumber;
+    @ExcelProperty(value = "其中，外聘保安人数", index = 7)
+    private Integer  outsourceCertificateNumber;
+    @ExcelProperty(value = "配有保安网点数 ", index = 7)
+    private Integer haveSecurityNetworkNumber;
+    @ExcelProperty(value = "本季度辖内所有营业网点组织开展自查次数（每个网点检查数量的累计数）", index = 7)
+    private Integer quarterSelfInspectNumber;
+    @ExcelProperty(value = "本季度度总行(联社)组织开展安全教育次数", index = 7)
+    private Integer quarterSafetyEducationNumber;
+    @ExcelProperty(value = "共计参与安全教育员工人次", index = 7)
+    private Integer safetyEducationPeopleNumber;
+    @ExcelProperty(value = "本季度开展预案演练次数", index = 7)
+    private Integer quarterDrillNumber;
+    @ExcelProperty(value = "参与预案演练员工人次", index = 7)
+    private Integer quarterDrillPeopleNumber;
+    @ExcelProperty(value = "本季度辖内所有营业网点开展预案演练次数（每个网点演练次数的累计数）", index = 7)
+    private Integer quarterAllNetworkDrillNumber;
+    @ExcelProperty(value = "辖内所有营业网点参与预案演练员工人次", index = 7)
+    private Integer quarterAllNetworkDrillPeopleNumber;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -619,7 +619,7 @@
     </select>
     <select id="select" resultType="com.xunmei.system.util.UserExport">
         SELECT
-        # h.user_id AS is_manager,
+
         GROUP_CONCAT(sr.role_name) role_names,
         CONCAT(',',GROUP_CONCAT( sr.id ),',') as roleIds,
         u.id,
@@ -657,7 +657,7 @@
         u.CODE,
         u.source,
         u.original_org_id,
-        u.is_manage as is_manager
+        u.is_manage as isManage
         FROM
         sys_user u
         LEFT JOIN sys_org o ON u.original_org_id = o.id