Forráskód Böngészése

1.处理控制台相关bug
2.处理上传图片的问题
3.处理生成签章问题
4.处理测试跳转发送验证码报错

hxl13994548489 2 éve
szülő
commit
4834fc8714

+ 1 - 1
src/main/java/com/ydtech/modules/admin/controller/kzt/KZTRoleController.java

@@ -103,7 +103,7 @@ public class KZTRoleController extends BaseController {
      *  @Description:  控制台所有角色
      */
     @ApiOperation(value = "控制台所有角色")
-    @PostMapping(value = "/findAll")
+    @GetMapping(value = "/findAll")
     public HttpResult findAll(String sysType) {
         if (StringUtils.isBlank(sysType)) {
             throw new SystemException("系統类型不能为空,传2为控制台!!");

+ 7 - 0
src/main/java/com/ydtech/modules/admin/dao/SysRoleMenuKztMapper.java

@@ -22,6 +22,13 @@ public interface SysRoleMenuKztMapper extends BaseMapper<SysRoleMenuKzt> {
      *  @Description: 通过角色id查询控制台关联的菜单
      */
     List<SysMenu> findMenuIdsByRoleId(@Param("roleId") Long roleId, @Param("sysType") String sysType);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/8/15 14:40
+     *  @Description:   通过角色id删除数据
+     */
+    void deleteByRoleId(@Param("roleId") Long roleId);
 }
 
 

+ 2 - 0
src/main/java/com/ydtech/modules/admin/service/impl/SysRoleMenuKztServiceImpl.java

@@ -41,6 +41,8 @@ public class SysRoleMenuKztServiceImpl extends ServiceImpl<SysRoleMenuKztMapper,
         String sysType = kZTRoleAndMenuDto.getSysType();
         List<Long> menuIds = kZTRoleAndMenuDto.getMenuIds();
         List<SysRoleMenuKzt>  list =new ArrayList<>();
+
+        sysRoleMenuKztMapper.deleteByRoleId(roleId);
         if(menuIds!=null && menuIds.size()>0){
             for(Long  menuId: menuIds){
                 SysRoleMenuKzt  sysRoleMenuKzt =new  SysRoleMenuKzt(null, roleId, menuId, sysType, new BaseController().getUserId(), new Date(), new BaseController().getUserId(),  new Date());

+ 3 - 3
src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java

@@ -29,7 +29,6 @@ import com.ydtech.modules.order.dao.InsOrdersMapper;
 import com.ydtech.modules.order.dao.InsUploadFilesMapper;
 import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.modules.order.entity.InsOrders;
-import com.ydtech.modules.order.entity.po.InsUploadFiles;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
 import com.ydtech.modules.protocols.service.InsFeeOrderNewService;
@@ -1155,8 +1154,9 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             }else{
                 //add  by   hxl   2024-07-09 添加银行回单的路径
                 if(audi!=null && StringUtils.isNotBlank(audi.getPicId())){
-                    InsUploadFiles insUploadFiles = insUploadFilesMapper.selectById(audi.getPicId());
-                    withdrawalDetalsDto.setBankReceipt(insUploadFiles==null?"":insUploadFiles.getUrl());
+                    //add by hxl  2024-08-15 屏蔽银行回单的路径
+                   // InsUploadFiles insUploadFiles = insUploadFilesMapper.selectById(audi.getPicId());
+                   // withdrawalDetalsDto.setBankReceipt(insUploadFiles==null?"":insUploadFiles.getUrl());
                 }
                 recordList.add(dto4);
             }

+ 2 - 0
src/main/java/com/ydtech/modules/order/service/InsUploadFilesService.java

@@ -29,6 +29,8 @@ public interface InsUploadFilesService extends IService<InsUploadFiles> {
         InsUploadFiles uploadFiles1 = getById(insUploadFiles.getId());
         if (ObjectUtil.isEmpty(uploadFiles1)) {
             save(insUploadFiles);
+        }else{
+            updateById(insUploadFiles);
         }
         return insUploadFiles;
     }

+ 1 - 1
src/main/java/com/ydtech/modules/order/service/impl/InsUploadFilesServiceImpl.java

@@ -44,7 +44,7 @@ public class InsUploadFilesServiceImpl extends ServiceImpl<InsUploadFilesMapper,
         String fileMD5 = DigestUtils.md5Hex(multipartFile.getBytes());
         InsUploadFiles uploadFiles = getById(fileMD5);
         if (ObjectUtil.isNotEmpty(uploadFiles)) {
-            return uploadFiles;
+           // return uploadFiles;
         }
 
         // 文件上传实体

+ 16 - 5
src/main/java/com/ydtech/modules/order/utils/QrCodeGenerator.java

@@ -181,11 +181,22 @@ public class QrCodeGenerator {
         String fileName = orderNo+"_"+subOrderNo+"_rwm.jpg";
         String saveFilePath = uploadPath+"//" + EXCEL_PATH +fileName;
         String resultPath = UPLOAD_PATH + fileName;
-        try{
-            bufferedImage = toBufferedImage(createBitMatrix(url, 300, 300));
-            ImageIO.write(bufferedImage, "png", new File(saveFilePath));
-        }catch(Exception e){
-          throw new SystemException("转为二维码报错,请重试!!");
+        // 创建File对象
+        File dir = new File(saveFilePath);
+        // 判断目录是否存在
+        if (!dir.exists()) {
+            boolean created = dir.mkdirs();
+            if (created) {
+                try{
+                    bufferedImage = toBufferedImage(createBitMatrix(url, 300, 300));
+                    ImageIO.write(bufferedImage, "png", new File(saveFilePath));
+                }catch(Exception e){
+                    throw new SystemException("转为二维码报错,请重试!!");
+                }
+            }else{
+                throw new SystemException("目录不存在,请重试!!");
+            }
+
         }
         return resultPath;
     }

+ 1 - 2
src/main/resources/application-test.yml

@@ -411,8 +411,7 @@ pingan:
     bucket: icore-pts-openapi-dmz-stg-pri
     ak: 8CJK29FVFY2IK9W0Y8IIdKWD06MI202F
     sk: K9VIM2C6W2YWDWDVK6966F29229dYMDF
-    signatureUrl: https://test.baoxianzhanggui.com/web-api
-
+    signatureUrl: https://test.baoxianzhanggui.com/web-api/#/Signature
 
 xxl:
   job:

+ 7 - 0
src/main/resources/mapper/modules/admin/SysRoleMenuKztMapper.xml

@@ -20,6 +20,13 @@
         sys_type,create_by,create_time,
         last_update_by,last_update_time
     </sql>
+    <delete id="deleteByRoleId">
+        delete
+        FROM
+            sys_role_menu_kzt
+        WHERE
+            role_id =#{roleId}
+    </delete>
     <select id="findMenuIdsByRoleId" resultType="com.ydtech.modules.admin.model.SysMenu">
         SELECT
             t.id,