Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.4

project_data/sql/0.0.4/soc/soc.sql

@@ -187,6 +187,10 @@ DELETE FROM `sys_dict_data` WHERE `dict_type`='sign_level';
 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 ( 0, '总行(联社)与各职能部门、营业网点', '1', 'sign_level', NULL, 'default', 'N', '0', '省联社账号', '2023-12-06 14:39:30', '超级管理员', '2023-12-06 14:41:49', NULL);
 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 ( 0, '各职能部门、营业网点与各员工', '2', 'sign_level', NULL, 'default', 'N', '0', '省联社账号', '2023-12-06 14:40:09', '超级管理员', '2023-12-06 14:41:56', NULL);
 
+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(), '' );
 -- 修改菜单排序
 UPDATE `sys_menu` SET `order_num` = 2 WHERE `menu_name` = '驾驶舱';
 UPDATE `sys_menu` SET `order_num` = 4 WHERE `menu_name` = '日常履职';

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 }, "the filename is too long");
+        super("upload.filename.exceed.length", new Object[] { defaultFileNameLength }, "上传文件名称超过最大长度限制");
     }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/service/impl/CoreSafetyBookNewServiceImpl.java

@@ -92,6 +92,8 @@ public class CoreSafetyBookNewServiceImpl extends ServiceImpl<CoreSafetyBookNewM
     @Override
     public CoreSafetyBookNew selectCoreSafetyBookNewById(Long id) {
         CoreSafetyBookNew coreSafetyBookNew = coreSafetyBookNewMapper.selectSafetyBookById(id);
+        coreSafetyBookNew.setPartyAOrgName(!coreSafetyBookNew.getType().equals(2L) ? coreSafetyBookNew.getPartyAOrgName() : orgService.selectOrgById(coreSafetyBookNew.getPartyAOrg(), SecurityConstants.INNER).getShortName());
+        coreSafetyBookNew.setPartyBOrgName(!coreSafetyBookNew.getType().equals(2L) ? orgService.selectOrgById(coreSafetyBookNew.getPartyBOrg(), SecurityConstants.INNER).getShortName():coreSafetyBookNew.getPartyBOrgName());
         coreSafetyBookNew.setFiles(coreSafetyBookBookFilesMapper.selecVotList(id));
         return coreSafetyBookNew;
     }

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

@@ -21,8 +21,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("/config")
-public class SysConfigController extends BaseController
-{
+public class SysConfigController extends BaseController {
     @Autowired
     private ISysConfigService configService;
 
@@ -31,8 +30,7 @@ public class SysConfigController extends BaseController
      */
     @RequiresPermissions("system:config:list")
     @GetMapping("/list")
-    public TableDataInfo<SysConfig> list(SysConfig config)
-    {
+    public TableDataInfo<SysConfig> list(SysConfig config) {
 
         return configService.selectPage(config);
     }
@@ -42,17 +40,20 @@ public class SysConfigController extends BaseController
      * 根据参数编号获取详细信息
      */
     @GetMapping(value = "/{configId}")
-    public AjaxResult getInfo(@PathVariable Long configId)
-    {
+    public AjaxResult getInfo(@PathVariable Long configId) {
         return success(configService.selectConfigById(configId));
     }
 
+    @GetMapping("/getIsDisplayPassword")
+    public AjaxResult getIsDisplayPassword() {
+        return success(configService.selectIsDisplayPassword());
+    }
+
     /**
      * 根据参数键名查询参数值
      */
     @GetMapping(value = "/configKey/{configKey}")
-    public AjaxResult getConfigKey(@PathVariable String configKey)
-    {
+    public AjaxResult getConfigKey(@PathVariable String configKey) {
         return success(configService.selectConfigByKey(configKey));
     }
 
@@ -62,10 +63,8 @@ public class SysConfigController extends BaseController
     @RequiresPermissions("system:config:add")
     @Log(title = "参数管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysConfig config)
-    {
-        if (!configService.checkConfigKeyUnique(config))
-        {
+    public AjaxResult add(@Validated @RequestBody SysConfig config) {
+        if (!configService.checkConfigKeyUnique(config)) {
             return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
         config.setCreateBy(SecurityUtils.getUsername());
@@ -78,10 +77,8 @@ public class SysConfigController extends BaseController
     @RequiresPermissions("system:config:edit")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysConfig config)
-    {
-        if (!configService.checkConfigKeyUnique(config))
-        {
+    public AjaxResult edit(@Validated @RequestBody SysConfig config) {
+        if (!configService.checkConfigKeyUnique(config)) {
             return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
         config.setUpdateBy(SecurityUtils.getUsername());
@@ -94,8 +91,7 @@ public class SysConfigController extends BaseController
     @RequiresPermissions("system:config:remove")
     @Log(title = "参数管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{configIds}")
-    public AjaxResult remove(@PathVariable Long[] configIds)
-    {
+    public AjaxResult remove(@PathVariable Long[] configIds) {
         configService.deleteConfigByIds(configIds);
         return success();
     }
@@ -106,18 +102,18 @@ public class SysConfigController extends BaseController
     @RequiresPermissions("system:config:remove")
     @Log(title = "参数管理", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
-    public AjaxResult refreshCache()
-    {
+    public AjaxResult refreshCache() {
         configService.resetConfigCache();
         return success();
     }
+
     @GetMapping("/findFirstByCode")
-    public R<SysConfig> findFirstByCode(String code){
+    public R<SysConfig> findFirstByCode(String code) {
         return R.ok(configService.findFirstByCode(code));
     }
 
     @GetMapping("/findSysConfigByCode")
-    public SysConfig findSysConfigByCode(String code){
+    public SysConfig findSysConfigByCode(String code) {
         return configService.findFirstByCode(code);
     }
 }

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

@@ -230,6 +230,11 @@ public class SysDeviceController extends BaseController {
                                 throw new RuntimeException("设备" + d.getDeviceName() + "关联主机不正确");
                             }
                         }
+                        if (d.getDefinition().equals("是")){
+                            sysDevice.setDefinition("1");
+                        }else {
+                            sysDevice.setDefinition("0");
+                        }
                         if (d.getAssetType().equals("消防类")) {
                             if (null == d.getCheckTime()) {
                                 throw new RuntimeException("设备名称" + d.getDeviceName() + "的有效期至缺失");

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

@@ -34,7 +34,7 @@ public interface ISysConfigService extends IService<SysConfig>
      * @return 参数配置信息
      */
     SysConfig selectConfigById(Long configId);
-
+SysConfig selectIsDisplayPassword();
     /**
      * 根据键名查询参数配置信息
      *

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

@@ -27,8 +27,7 @@ import java.util.List;
  * @author xunmei
  */
 @Service
-public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig> implements ISysConfigService
-{
+public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig> implements ISysConfigService {
     @Resource
     private SysConfigMapper configMapper;
 
@@ -37,25 +36,25 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
      * 项目启动时，初始化参数到缓存
      */
     @PostConstruct
-    public void init()
-    {
+    public void init() {
         loadingConfigCache();
     }
+
     @Override
     public SysConfig findFirstByCode(String code) {
         return configMapper.selectOne(new QueryWrapper<SysConfig>().eq("config_key", code));
     }
+
     @Override
     public TableDataInfo<SysConfig> selectPage(SysConfig sysConfig) {
 
         Page<SysConfig> page;
-        if (sysConfig.getPageNum()!=null&&sysConfig.getPageSize()!=null)
-        {
+        if (sysConfig.getPageNum() != null && sysConfig.getPageSize() != null) {
             page = new Page<>(sysConfig.getPageNum(), sysConfig.getPageSize());
-        }else{
+        } else {
             page = new Page<>();
         }
-        page = configMapper.selectPage( page,new QueryWrapper<>(sysConfig));
+        page = configMapper.selectPage(page, new QueryWrapper<>(sysConfig));
         return TableDataInfo.build(page);
     }
 
@@ -66,13 +65,20 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
      * @return 参数配置信息
      */
     @Override
-    public SysConfig selectConfigById(Long configId)
-    {
+    public SysConfig selectConfigById(Long configId) {
         SysConfig config = new SysConfig();
         config.setConfigId(configId);
         return configMapper.selectConfig(config);
     }
 
+    @Override
+    public SysConfig selectIsDisplayPassword() {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("config_key", "is_display_password");
+        SysConfig sysConfig = baseMapper.selectOne(queryWrapper);
+        return sysConfig;
+    }
+
     /**
      * 根据键名查询参数配置信息
      *
@@ -80,19 +86,16 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
      * @return 参数键值
      */
     @Override
-    public String selectConfigByKey(String configKey)
-    {
+    public String selectConfigByKey(String configKey) {
         String configValue = Convert.toStr(RedisUtils.getCacheObject(getCacheKey(configKey)));
         //String configValue = Convert.toStr(redisService.getCacheObject(getCacheKey(configKey)));
-        if (StringUtils.isNotEmpty(configValue))
-        {
+        if (StringUtils.isNotEmpty(configValue)) {
             return configValue;
         }
         SysConfig config = new SysConfig();
         config.setConfigKey(configKey);
         SysConfig retConfig = configMapper.selectConfig(config);
-        if (StringUtils.isNotNull(retConfig))
-        {
+        if (StringUtils.isNotNull(retConfig)) {
             RedisUtils.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue());
             //redisService.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue());
             return retConfig.getConfigValue();
@@ -107,8 +110,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
      * @return 参数配置集合
      */
     @Override
-    public List<SysConfig> selectConfigList(SysConfig config)
-    {
+    public List<SysConfig> selectConfigList(SysConfig config) {
         return configMapper.selectConfigList(config);
     }
 
@@ -119,11 +121,9 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
      * @return 结果
      */
     @Override
-    public int insertConfig(SysConfig config)
-    {
+    public int insertConfig(SysConfig config) {
         int row = configMapper.insertConfig(config);
-        if (row > 0)
-        {
+        if (row > 0) {
             RedisUtils.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
             //redisService.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
         }
@@ -137,18 +137,15 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
      * @return 结果
      */
     @Override
-    public int updateConfig(SysConfig config)
-    {
+    public int updateConfig(SysConfig config) {
         SysConfig temp = configMapper.selectConfigById(config.getConfigId());
-        if (!StringUtils.equals(temp.getConfigKey(), config.getConfigKey()))
-        {
+        if (!StringUtils.equals(temp.getConfigKey(), config.getConfigKey())) {
             RedisUtils.deleteObject(getCacheKey(temp.getConfigKey()));
             //redisService.deleteObject(getCacheKey(temp.getConfigKey()));
         }
 
         int row = configMapper.updateConfig(config);
-        if (row > 0)
-        {
+        if (row > 0) {
             RedisUtils.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
             //redisService.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
         }
@@ -161,13 +158,10 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
      * @param configIds 需要删除的参数ID
      */
     @Override
-    public void deleteConfigByIds(Long[] configIds)
-    {
-        for (Long configId : configIds)
-        {
+    public void deleteConfigByIds(Long[] configIds) {
+        for (Long configId : configIds) {
             SysConfig config = selectConfigById(configId);
-            if (StringUtils.equals(UserConstants.YES, config.getConfigType()))
-            {
+            if (StringUtils.equals(UserConstants.YES, config.getConfigType())) {
                 throw new ServiceException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
             }
             configMapper.deleteConfigById(configId);
@@ -180,11 +174,9 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
      * 加载参数缓存数据
      */
     @Override
-    public void loadingConfigCache()
-    {
+    public void loadingConfigCache() {
         List<SysConfig> configsList = configMapper.selectConfigList(new SysConfig());
-        for (SysConfig config : configsList)
-        {
+        for (SysConfig config : configsList) {
             RedisUtils.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
             //redisService.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
         }
@@ -194,8 +186,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
      * 清空参数缓存数据
      */
     @Override
-    public void clearConfigCache()
-    {
+    public void clearConfigCache() {
         /*Collection<String> keys = redisService.keys(CacheConstants.SYS_CONFIG_KEY + "*");
         redisService.deleteObject(keys);*/
         RedisUtils.deleteByPrefix(CacheConstants.SYS_CONFIG_KEY);
@@ -205,8 +196,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
      * 重置参数缓存数据
      */
     @Override
-    public void resetConfigCache()
-    {
+    public void resetConfigCache() {
         clearConfigCache();
         loadingConfigCache();
     }
@@ -218,12 +208,10 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
      * @return 结果
      */
     @Override
-    public boolean checkConfigKeyUnique(SysConfig config)
-    {
+    public boolean checkConfigKeyUnique(SysConfig config) {
         Long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId();
         SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey());
-        if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue())
-        {
+        if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -235,8 +223,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
      * @param configKey 参数键
      * @return 缓存键key
      */
-    private String getCacheKey(String configKey)
-    {
+    private String getCacheKey(String configKey) {
         return CacheConstants.SYS_CONFIG_KEY + configKey;
     }
 }

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

@@ -36,4 +36,6 @@ public class DeviceExport {
     private String hostName;
     @ExcelProperty(value = "通道号", index = 7)
     private Long channel;
+    @ExcelProperty(value = "是否高清", index = 8)
+    private String definition;
 }