完善

platform-dao/src/main/java/com/platform/dao/entity/repair/RepairApplicationForm.java

@@ -38,6 +38,7 @@ public class RepairApplicationForm implements Serializable {
     /**
      * 设备使用位置
      */
+    @Transient
     private String sbCph;
     /**
      * 是否停机: 1-是 2-否

platform-dao/src/main/java/com/platform/dao/mapper/sb/SbInfoMapper.java

@@ -41,6 +41,14 @@ public interface SbInfoMapper extends MyMapper<SbInfo> {
      */
     void updateBatch(List<SbInfoVO> list);
 
+    /**
+     * 批量更新设备二维码
+     *
+     * @param list
+     * @return
+     */
+    void updateBatchQrCode(List<SbInfo> list);
+
     /**
      * 批量更新，用于定时任务生成后更新设备的保养、润换时间
      *

platform-dao/src/main/resources/mapper/sb/SbInfoMapper.xml

@@ -519,6 +519,16 @@ sb.scrap_user_name
         </foreach>
     </update>
 
+    <update id="updateBatchQrCode" parameterType="java.util.List">
+        <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+            update t_sb_info
+            <set>
+                qr_code=#{item.qrCode}
+            </set>
+            where id = #{item.id}
+        </foreach>
+    </update>
+
     <update id="updateBatchChild" parameterType="java.util.List">
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">
             update t_sb_info

platform-rest/src/main/java/com/platform/rest/controller/upms/SysCodeController.java

@@ -77,4 +77,15 @@ public class SysCodeController {
         return R.success(codePath);
     }
 
+    /**
+     * 重新生成所有设备的二维码
+     *
+     * @return R
+     */
+    @PostMapping("/sb/all")
+    public R generaeSbCodeAll() {
+        sbInfoService.generateSbCodeAll();
+        return R.success("生成成功");
+    }
+
 }

platform-rest/src/main/java/com/platform/rest/controller/upms/SysConfigController.java

@@ -68,6 +68,20 @@ public class SysConfigController {
       return new R<>();
   }
 
+    /**
+     * 批量修改记录
+     *
+     * @param sysConfigDTOList 系统参数配置DTO列表
+     * @return R
+     */
+    @SysLog("修改系统参数配置")
+    @PutMapping("/update/batch")
+    @PreAuthorize("@pms.hasPermission('upms-configs-edit')")
+    public R updateBatch(@Validated({UpdateGroup.class}) @RequestBody List<SysConfigDTO> sysConfigDTOList) {
+        sysConfigService.modModelListByDTO(sysConfigDTOList);
+        return new R<>();
+    }
+
   /**
    * 通过id删除一条记录
    *

platform-service/src/main/java/com/platform/service/sb/SbInfoService.java

@@ -219,4 +219,6 @@ public interface SbInfoService extends IBaseService<SbInfo, SbInfoDTO> {
     void audit(SbInfoDTO sbInfoDTO);
 
     List<SbInfoVO> getByIds(List<String> ids);
+
+    void generateSbCodeAll();
 }

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -1085,6 +1085,20 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
         List<SysDept> deptList = deptMapper.selectAll();
         List<SysUser> userList = sysUserMapper.selectAll();
         for(SbInfoVO vo:voList){
+            if(StringUtils.isBlank(vo.getQrCode())){
+                // 保存二维码
+                String path = CommonConstants.RESOURCE_PREFIX + "/png/" + DateUtil.formatDate(new Date()) + "/" + IdGeneratorUtils.getObjectId() + "/";
+                String rootPath = environment.getProperty("upload.root-dir");
+                String filePath = rootPath + path;
+                String codePath = path + vo.getId() + ".png";
+                CodeFileUtils.uploadFileECode(vo.getId(), rootPath, filePath, vo.getId() + ".png");
+                // 修改二维码
+                SbInfoDTO sbInfoDTO = new SbInfoDTO();
+                sbInfoDTO.setId(vo.getId());
+                sbInfoDTO.setQrCode(codePath);
+                this.updateQrCode(sbInfoDTO);
+                vo.setQrCode(codePath);
+            }
             if (vo.getUseCompany() != null) {
                 deptList.forEach(sysDept -> {
                     if (sysDept.getDeptId().equals(vo.getUseCompany())) {
@@ -1113,6 +1127,24 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
         return voList;
     }
 
+    @Override
+    public void generateSbCodeAll() {
+        List<SbInfo> list = mapper.selectAll();
+        if(CollectionUtil.isNotEmpty(list)){
+            // 保存二维码
+            for(SbInfo sbInfo:list){
+                String path = CommonConstants.RESOURCE_PREFIX + "/png/" + DateUtil.formatDate(new Date()) + "/" + IdGeneratorUtils.getObjectId() + "/";
+                String rootPath = environment.getProperty("upload.root-dir");
+                String filePath = rootPath + path;
+                String codePath = path + sbInfo.getId() + ".png";
+                CodeFileUtils.uploadFileECode(sbInfo.getId(), rootPath, filePath, sbInfo.getId() + ".png");
+                // 修改
+                sbInfo.setQrCode(codePath);
+            }
+            mapper.updateBatchQrCode(list);
+        }
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String importListByAdd(MultipartFile file) {

platform-service/src/main/java/com/platform/service/upms/SysConfigService.java

@@ -42,4 +42,6 @@ public interface SysConfigService extends IBaseService<SysConfig, SysConfigDTO>
      * @return
      */
     SysConfig getByCode(String code);
+
+    void modModelListByDTO(List<SysConfigDTO> sysConfigDTOList);
 }

platform-service/src/main/java/com/platform/service/upms/impl/SysConfigServiceImpl.java

@@ -1,9 +1,11 @@
 package com.platform.service.upms.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.platform.common.bean.LabelValueObject;
 import com.platform.common.constant.UpmsRedisKeyConstants;
 import com.platform.common.enums.ResultCode;
 import com.platform.common.exception.BusinessException;
+import com.platform.common.util.BeanConverterUtil;
 import com.platform.common.util.RedisUtils;
 import com.platform.dao.dto.upms.SysConfigDTO;
 import com.platform.dao.entity.upms.SysConfig;
@@ -110,4 +112,19 @@ public class SysConfigServiceImpl extends BaseServiceImpl<SysConfigMapper, SysCo
         }
         return configs.get(0);
     }
+
+    @Override
+    public void modModelListByDTO(List<SysConfigDTO> sysConfigDTOList) {
+        if(CollectionUtil.isNotEmpty(sysConfigDTOList)){
+            for(SysConfigDTO model: sysConfigDTOList){
+                Weekend<SysConfig> weekend = new Weekend<>(SysConfig.class);
+                WeekendCriteria<SysConfig, Object> weekendCriteria = weekend.weekendCriteria();
+                weekendCriteria.andEqualTo(SysConfig::getCode, model.getCode());
+                SysConfig sysConfig = new SysConfig();
+                sysConfig.setContent(model.getContent());
+                mapper.updateByExampleSelective(sysConfig, weekend);
+            }
+            init();
+        }
+    }
 }

platform-service/src/main/java/com/platform/service/util/CodeFileUtils.java

@@ -47,9 +47,7 @@ public class CodeFileUtils {
 
         }
 
-        QrcodeConfig config = new QrcodeConfig()
-                .setBorderSize(2)
-                .setPadding(2);
+        QrcodeConfig config = new QrcodeConfig(100,100).setMargin(2);
         SimpleQrcodeGenerator simpleQrcodeGenerator = new SimpleQrcodeGenerator(config);
         if (StringUtils.isNotBlank(logPath)) {
             simpleQrcodeGenerator