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

# Conflicts:
#	soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/TMonitoringRetrievalPlanController.java
#	soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java
#	soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysRoleController.java

project_data/sql/0.0.4/soc/soc.sql

@@ -191,6 +191,14 @@ delete  from sys_config where  config_key='is_display_password';
 INSERT INTO sys_config ( config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark )
 VALUES
     ( '是否显示修改资料和修改密码', 'is_display_password', 'Y', 'Y', 'jwx', now(), 'jwx', now(), 'Y不显示，N显示' );
+DELETE FROM `sys_menu` WHERE id IN(1714247486990786561,2126,01717081639428923393,01717081756911378434);
+INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark)
+VALUES (1714247486990786561, '撤回计划', 2052, 9, '', null, null, 1, 0, 'F', '0', '0', 'core:accessPlan:withdraw', '1', null, null, null, now(), '', null, '');
+INSERT INTO `sys_menu` VALUES (2126, '下发任务', 2052, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:accessPlan:release', '1', '#', NULL, '超级管理员', '2023-09-04 17:54:35', '', NULL, '');
+INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
+VALUES (01717081639428923393, '下发', 1717076927401005058, 7, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'core:evaluatePlan:distribute', '1', NULL, NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
+INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
+VALUES (01717081756911378434, '撤回', 1717076927401005058, 8, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'core:evaluatePlan:withdraw', '1', NULL, NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
 -- 修改菜单排序
 UPDATE `sys_menu` SET `order_num` = 2 WHERE `menu_name` = '驾驶舱';
 UPDATE `sys_menu` SET `order_num` = 4 WHERE `menu_name` = '日常履职';
@@ -347,5 +355,8 @@ UPDATE sys_menu set menu_name='编辑手册' WHERE menu_name='履职内容库定
 UPDATE sys_menu set menu_name='删除' WHERE menu_name='履职内容库定义删除' and menu_type='F' and platform_type=1;
 UPDATE sys_menu set menu_name='管理履职内容' WHERE menu_name='履职内容库管理' and menu_type='F' and platform_type=1;
 UPDATE sys_menu set menu_name='管理检查内容' WHERE menu_name='内容库管理' and menu_type='F' and platform_type=1;
+-- 新增来访管理登记簿字典
+delete from sys_dict_data where dict_type='register_book_type' and dict_label='来访管理登记簿';
+INSERT INTO `sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (3, '来访管理登记簿', '3', 'register_book_type', NULL, 'default', 'N', '0', NULL, NOW(), NULL, NOW(), NULL);
 
 

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysOrgExtend.java

@@ -100,6 +100,7 @@ public class SysOrgExtend extends BaseEntity {
     /**
      * 值守方式
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "值守方式")
     private Integer dutyMode;
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/exception/file/FileNameLengthLimitExceededException.java

@@ -11,6 +11,6 @@ public class FileNameLengthLimitExceededException extends FileException
 
     public FileNameLengthLimitExceededException(int defaultFileNameLength)
     {
-        super("upload.filename.exceed.length", new Object[] { defaultFileNameLength }, "上传文件名称超过最大长度限制");
+        super("upload.filename.exceed.length", new Object[] { defaultFileNameLength }, "上传文件名称超过最大字符长度限制:"+defaultFileNameLength);
     }
 }

soc-gateway/src/main/java/com/xunmei/gateway/filter/XssFilter.java

@@ -96,20 +96,8 @@ public class XssFilter implements GlobalFilter, Ordered
             @Override
             public HttpHeaders getHeaders()
             {
-                HttpHeaders httpHeaders = new HttpHeaders();
                 HttpHeaders headers = super.getHeaders();
-            /*    // 遍历源HttpHeaders对象并验证每个头
-                for (String headerName : headers.keySet()) {
-                    String headerValue = headers.getFirst(headerName);
-                    if ( headerName.matches("[a-zA-Z0-9._\\-]+") && headerValue.matches("[a-zA-Z0-9._\\-]+")) {
-                        httpHeaders.add(headerName, headerValue);
-                    }
-                }*/
-                httpHeaders.putAll(headers);
-                // 由于修改了请求体的body，导致content-length长度不确定，因此需要删除原先的content-length
-                httpHeaders.remove(HttpHeaders.CONTENT_LENGTH);
-                httpHeaders.set(HttpHeaders.TRANSFER_ENCODING, "chunked");
-                return httpHeaders;
+                return headers;
             }
 
         };

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/TMonitoringRetrievalPlanController.java

@@ -76,7 +76,7 @@ public class TMonitoringRetrievalPlanController extends BaseController {
         } else if (SecurityUtils.getUserId() == 1) {
             admin = true;
         }
-        ajax.put("check", admin);
+     //   ajax.put("check", admin);
         ajax.put("isEdit", sysOrg.getId());
         return ajax;
     }
@@ -85,7 +85,7 @@ public class TMonitoringRetrievalPlanController extends BaseController {
      * 下发
      */
     @ApiOperation(value = "下发")
-    @RequiresPermissions("core:accessPlan:add")
+    @RequiresPermissions("core:accessPlan:release")
     @GetMapping(value = "/distribute/{id}/{immediateEffect}")
     public AjaxResult distribute(@PathVariable(value = "id", required = false) Long id, @PathVariable Boolean immediateEffect) throws ParseException {
         return success(tMonitoringRetrievalPlanService.distribute(id,immediateEffect));
@@ -95,7 +95,7 @@ public class TMonitoringRetrievalPlanController extends BaseController {
      * 撤回
      */
     @ApiOperation(value = "撤回")
-    @RequiresPermissions("core:accessPlan:add")
+    @RequiresPermissions("core:accessPlan:withdraw")
     @GetMapping(value = "/withdraw/{id}")
     public AjaxResult withdraw(@PathVariable(value = "id", required = false) Long id) {
         return success(tMonitoringRetrievalPlanService.withdraw(id));

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

@@ -122,14 +122,14 @@ public class CoreEvaluatePlanController extends BaseController {
      * 下发
      */
     @ApiOperation(value = "下发")
-    @RequiresPermissions("core:evaluatePlan:add")
+    @RequiresPermissions("core:evaluatePlan:distribute")
     @GetMapping(value = "/distribute/{id}")
     public AjaxResult distribute(@PathVariable(value = "id", required = false) Long id) {
         return toAjax(coreEvaluatePlanService.distribute(id));
     }
 
     @ApiOperation(value = "取消下发")
-    @RequiresPermissions("core:evaluatePlan:remove")
+    @RequiresPermissions("core:evaluatePlan:withdraw")
     @GetMapping(value = "/withdraw/{id}")
     public AjaxResult withdraw(@PathVariable(value = "id", required = false) Long id) {
         return toAjax(coreEvaluatePlanService.withdraw(id));

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/mapper/CoreIntroduceLetterMapper.java

@@ -111,4 +111,7 @@ public interface CoreIntroduceLetterMapper extends BaseMapper<CoreIntroduceLette
     List<PanelListVo> selectToDoApproveListForAPP(@Param("request") CoreIntroduceLetterApproveRequestDto request);
 
 
+    void batchUpdateApproveLogStatus(@Param("requestList") List<CoreIntroduceLetterApproveLog> requestList);
+    void updateApproveLogStatus(@Param("request") CoreIntroduceLetterApproveLog request);
+
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreIntroduceLetterServiceImpl.java

@@ -1,7 +1,5 @@
 package com.xunmei.core.letter.service.impl;
 
-import cn.hutool.core.date.DateField;
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSON;
@@ -22,7 +20,6 @@ import com.xunmei.common.core.domain.panel.enums.PanelTypeEnums;
 import com.xunmei.common.core.domain.panel.vo.PanelListVo;
 import com.xunmei.common.core.domain.panel.vo.WebPanelResult;
 import com.xunmei.common.core.util.BeanHelper;
-import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.utils.DictUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
@@ -30,8 +27,6 @@ import com.xunmei.core.letter.mapper.CoreIntroduceLetterApproveLogMapper;
 import com.xunmei.core.letter.mapper.CoreIntroduceLetterMapper;
 import com.xunmei.core.letter.mapper.CoreOutInRecordMapper;
 import com.xunmei.core.letter.service.ICoreIntroduceLetterService;
-import com.xunmei.core.safetyCheck.domain.CoreSafetyTask;
-import com.xunmei.system.api.Eto.RoleConditionEto;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.RemoteRoleService;
 import com.xunmei.system.api.domain.SysOrg;
@@ -42,8 +37,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.time.LocalDate;
-import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -415,6 +408,7 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
         oqw.ne(CoreIntroduceLetter::getStatus, 2).eq(CoreIntroduceLetter::getDeleted, 0);
         List<CoreIntroduceLetter> coreIntroduceLetters = coreIntroduceLetterMapper.selectList(oqw);
         List<CoreIntroduceLetter> overdueLettersList = new ArrayList<>();
+        List<CoreIntroduceLetterApproveLog> approveLogs=  new ArrayList<>();
         if (ObjectUtil.isNotEmpty(coreIntroduceLetters)) {
             Date currentDate = DateUtil.beginOfDay(new Date());
 
@@ -423,10 +417,19 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
                 if (result > 0) {
                     x.setStatus(2);
                     overdueLettersList.add(x);
+                    CoreIntroduceLetterApproveLog approveLog=   new CoreIntroduceLetterApproveLog();
+                    approveLog.setLetterId(x.getId());
+                    approveLog.setApproveStatus(3);
+                    approveLogs.add(approveLog);
                 }
             });
         }
         if (ObjectUtil.isNotEmpty(overdueLettersList)) {
+            approveLogs.forEach(x->{
+                coreIntroduceLetterMapper.updateApproveLogStatus(x);
+            });
+            // 批量修改需要修改连接字符串添加 &allowMultiQueries=true
+            //coreIntroduceLetterMapper.batchUpdateApproveLogStatus(approveLogs);
             saveOrUpdateBatch(overdueLettersList);
         }
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreOutInRecordServiceImpl.java

@@ -272,7 +272,6 @@ public class CoreOutInRecordServiceImpl extends ServiceImpl<CoreOutInRecordMappe
         //来访单位
         String outOrgName = ObjectUtil.isNotEmpty(outOrg.getShortName()) ? outOrg.getShortName() : outOrg.getName();
         data.put("outOrgName", outOrgName);
-        log.info("***********:{}",JSON.toJSONString(data));
         //来访人员
         data.put("userName", record.getUserName());
         //证件类型
@@ -306,7 +305,7 @@ public class CoreOutInRecordServiceImpl extends ServiceImpl<CoreOutInRecordMappe
             List<String> strings = new ArrayList<>();
             for (String json : list) {
                 final Map map = JSON.parseObject(json, Map.class);
-                final String url = (String) map.get("url");
+                final String url = (String) map.get("imgPath");
                 if (ObjectUtil.isNotEmpty(url)) {
                     strings.add(url);
                 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/ApiPlanController.java

@@ -113,7 +113,8 @@ public class ApiPlanController {
 
     @GetMapping("/buildPdf")
     public AjaxResult buildPdf() {
-        return appPlanService.buildPdf();
+        appPlanService.buildPdf();
+        return AjaxResult.success();
     }
 
     /**

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

@@ -88,7 +88,7 @@ public interface AppPlanService extends IService<AppPlan> {
 
     AppPlan distributeHS(Long id, Boolean immediateEffect);
 
-    AjaxResult buildPdf();
+    void buildPdf();
     AjaxResult buildResumptionPdf(Long id);
 
     /**

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.constant.Constants;
 import com.xunmei.common.core.constant.ErrorMsgConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.DateRange;
@@ -18,7 +19,6 @@ import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.enums.CycleCommonEnum;
 import com.xunmei.common.core.enums.OrgTypeEnum;
 import com.xunmei.common.core.enums.PlanStatus;
-import com.xunmei.common.core.enums.resumption.ResumptionTaskStatus;
 import com.xunmei.common.core.exception.ServiceException;
 import com.xunmei.common.core.domain.registerbook.domain.CoreRegisterBookPdf;
 import com.xunmei.common.core.enums.RegisterBookType;
@@ -969,7 +969,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         Map<String, Object> data = this.getFtlResumption(orgid);
         data.put("fileName", fileName);
         data.put("orgName", sysOrg.getShortName());
-        data.put("dateStr", DateUtils.getTime());
+        data.put("dateStr", DateUtil.format(new Date(), Constants.DAILY_FORMAT));
         data.put("remark", "");
         CompletableFuture.runAsync(() -> {
             R<String> r = RemoteCallHandlerExecutor.executeRemoteCall(() -> fileService.generateResumptionPdf(data), ErrorMsgConstants.GENERATE_PDF_ERROR);
@@ -1003,20 +1003,19 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
 
     @Async
     @Override
-    public AjaxResult buildPdf() {
-        Date date = DateUtils.addDays(new Date(), -1);
+    public void buildPdf() {
+        Date date = new Date();
 
         List<Resumption> resumptions = resumptionMapper.selectList(new LambdaQueryWrapper<Resumption>().eq(Resumption::getYmdDate, DateUtils.toLocalDate(date)).eq(Resumption::getStatus, 3));
         List<Long> orgIds = resumptions.stream().map(Resumption::getOrgId).distinct().collect(Collectors.toList());
         orgIds.forEach(this::buildResumptionPdf);
-        return AjaxResult.success("正在生成pdf，请稍后刷新页面查看!");
     }
 
     private Map<String, Object> getFtlResumption(Long orgId) {
         Map<String, Object> data = new HashMap<>();
         //获取前一天
 //        Date date = DateUtils.addDays(new Date(), 0);
-        Date date = DateUtils.addDays(new Date(), -1);
+        Date date = new Date();
         //获取营业前的所有履职信息
         List<Resumption> before = resumptionMapper.selectByYmdDateAndExec(date, 2, orgId);
         //获取营业期间的所有履职信息

soc-modules/soc-modules-core/src/main/resources/mapper/letter/CoreIntroduceLetterMapper.xml

@@ -180,6 +180,16 @@
         update core_introduce_letter_approve_log set check_status=#{checkLog.checkStatus},check_remark=#{checkLog.checkRemark},check_user=#{checkLog.checkUser},check_time=#{checkLog.checkTime},status=#{checkLog.status}
         where id=#{checkLog.id}
     </insert>
+    <update id="batchUpdateApproveLogStatus" parameterType="java.util.List">
+        <foreach collection="requestList" item="item" index="index" separator=";">
+            update core_introduce_letter_approve_log set approve_status=#{item.approveStatus} where letter_id=#{item.letterId}
+        </foreach>
+    </update>
+    <update id="updateApproveLogStatus" >
+
+            update core_introduce_letter_approve_log set approve_status=#{request.approveStatus} where letter_id=#{request.letterId}
+
+    </update>
     <insert id="saveCheckLogs">
         insert into
             core_introduce_letter_approve_log (id,letter_id,org_id,approve_status)values
@@ -379,7 +389,7 @@
         c.approve_status as status
         from core_introduce_letter a
         left join core_introduce_letter_approve_log c on a.id=c.letter_id
-        where a.deleted=0 ANd a.status!=0 AND c.approve_status=1
+        where a.deleted=0 ANd a.status=1 AND c.approve_status=0
         <if test="request.orgId !=null  and request.orgId !=''">
             and c.org_id = #{request.orgId}
         </if>

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/utils/FileUploadUtils.java

@@ -125,11 +125,6 @@ public class FileUploadUtils
             InvalidExtensionException{
 
         byte[] decode = Base64.decode(file.getContent());
-        InputStream inputStream = new ByteArrayInputStream(decode);
-        String type = FileTypeUtil.getType(inputStream);
-        if(!isAllowedExtension(type,MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION.toArray(new String[0]))){
-            throw new RuntimeException("上传文件类型不允许");
-        }
         String extension = file.getExtension();
         if(StringUtils.isEmpty(extension) || "null".equals(extension))
         {

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

@@ -142,6 +142,7 @@ public class SysRoleController extends BaseController {
         return success(roleService.selectRoleAll());
     }
 
+    // 发现有其他页面的下拉在使用该接口，其他页面的角色可能不存在system:role:query 权限，先把权限注释掉
 //    @RequiresPermissions("system:role:query")
     @GetMapping("/allRole")
     public AjaxResult allRole() {

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

@@ -273,7 +273,7 @@ public class SysUserController extends BaseController {
         user.setCreateTime(new Date());
         final String salt = SecurityUtils.salt();
         user.setSalt(salt);
-        user.setPassword(SecurityUtils.passwordAddSalt(user.getPassword(), salt));
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword(), salt));
         user.setOriginalOrgId(user.getOrgId());
         userService.insertUser(user);
         return AjaxResult.success();
@@ -340,7 +340,7 @@ public class SysUserController extends BaseController {
         userService.checkUserDataScope(user.getId());
         final String salt = SecurityUtils.salt();
         user.setSalt(salt);
-        user.setPassword(SecurityUtils.passwordAddSalt(user.getPassword(), salt));
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword(), salt));
         user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.resetPwd(user));
     }

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

@@ -103,6 +103,14 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         }
         //获取数据
         page = baseMapper.selectOrgList(page, org);
+        if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(page.getRecords()) && page.getTotal() > 0) {
+            if (org.getPageNum() != null && org.getPageSize() != null) {
+                page = new Page<>(0, org.getPageSize());
+            } else {
+                page = new Page<>();
+            }
+            page = baseMapper.selectOrgList(page, org);
+        }
         //抓换为TableDataInfo适配前端
         return TableDataInfo.build(page);