zhuang пре 1 година
родитељ
комит
b187385ce5

+ 5 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxApiDao.java

@@ -2,6 +2,8 @@ package com.rongwei.bscommon.sys.dao;
 
 import com.rongwei.bsentity.vo.ZhcxOutsideInspectionVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 import java.util.Map;
@@ -13,4 +15,7 @@ import java.util.Map;
 public interface ZhcxApiDao {
 
     List<ZhcxOutsideInspectionVo> getOutsideInspectionList(Map<String, Object> map);
+
+    @Select("select ALL_QUALIFIED from ZHCX_CHECK_BEFORE_QUALIFIED where DELETED = '0' AND PID =#{id}")
+    List<String> getCoreInspectionDetailList(@Param("id") String id);
 }

+ 2 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxApiService.java

@@ -20,4 +20,6 @@ public interface ZhcxApiService {
     R resetPassword(Map<String, Object> map);
 
     R sendReviewSupervisionMail(Map<String, Object> map);
+
+    R getCoreInspectionDetailList(Map<String, Object> map);
 }

+ 11 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxApiServiceImpl.java

@@ -173,6 +173,17 @@ public class ZhcxApiServiceImpl implements ZhcxApiService {
         return null;
     }
 
+    @Override
+    public R getCoreInspectionDetailList(Map<String, Object> map) {
+        Object idObj = map.get("ID");
+        if(ObjectUtil.isEmpty(idObj)){
+            return R.error("没有ID");
+        }
+        String id = (String) idObj;
+        List<String> list = zhcxApiDao.getCoreInspectionDetailList(id);
+        return R.ok(list);
+    }
+
     private R sendSmsCode(String templateId, String redisKeyName, String mobile, String redisLabelName) {
         boolean exists = redisService.hasKey(redisKeyName);
         String sendCodeTimeObj = (String) redisService.getRedisCatchObj(redisKeyName);

+ 2 - 2
business-common/src/main/java/com/rongwei/bscommon/sys/utils/CodeGeneration.java

@@ -57,7 +57,7 @@ public class CodeGeneration {
         dsc.setDriverName("dm.jdbc.driver.DmDriver");
         dsc.setUsername("INCONTROL");
         dsc.setPassword("INCONTROL");
-        dsc.setUrl("jdbc:dm://192.168.0.204:5237");  //指定数据库
+        dsc.setUrl("jdbc:dm://61.177.40.178:5237");  //指定数据库
         autoGenerator.setDataSource(dsc);
 
         // 3、包的配置
@@ -85,7 +85,7 @@ public class CodeGeneration {
         strategy.setSuperEntityClass(BaseDo.class);
         strategy.setRestControllerStyle(true);
         // 设置要映射的表名(重要,需要修改的地方)
-        strategy.setInclude("ZHCX_PROJECT_DEVICE_NUMBER");
+        strategy.setInclude("ZHCX_SUPERVISION_CUSTOM_USER_MANAGE");
         strategy.setNaming(NamingStrategy.underline_to_camel); // 自动转换表名的驼峰命名法
         strategy.setColumnNaming(NamingStrategy.no_change); // 自动转换列名的驼峰命名法
         strategy.setEntityLombokModel(true); // 是否使用lombox

+ 53 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/utils/SmsCodeGenerateUtils.java

@@ -0,0 +1,53 @@
+package com.rongwei.bscommon.sys.utils;
+
+import java.security.SecureRandom;
+
+/**
+ * @author zhuang
+ */
+public class SmsCodeGenerateUtils {
+
+    private static final SecureRandom secureRandom = new SecureRandom();
+    private static final StringBuilder codeStringBuilder = new StringBuilder();
+    /**
+     * 采用单例模式以重用StringBuilder,同时提供一个方法来生成指定长度的验证码
+     */
+    private static final SmsCodeGenerateUtils INSTANCE = new SmsCodeGenerateUtils();
+
+    /**
+     * 私有化构造方法防止外部实例化
+     */
+    private SmsCodeGenerateUtils() {
+        // 初始化6位
+        codeStringBuilder.setLength(CxConstants.CODE_LENGTH);
+    }
+
+    /**
+     * 提供一个接口来获取验证码生成器实例,这样也使得未来如果有需要,可以轻松地修改生成逻辑
+     * @return
+     */
+    public static SmsCodeGenerateUtils getInstance() {
+        return INSTANCE;
+    }
+
+    /**
+     * 生成6位验证码方法
+     * @return
+     */
+    public String generateVerificationCode() {
+        codeStringBuilder.setLength(0);
+        for (int i = 0; i < CxConstants.CODE_LENGTH; i++) {
+            codeStringBuilder.append(generateRandomDigit());
+        }
+        return codeStringBuilder.toString();
+    }
+
+
+    /**
+     * 生成一个随机数字,0到9之间的整数
+     * @return
+     */
+    private int generateRandomDigit() {
+        return secureRandom.nextInt(10);
+    }
+}

+ 6 - 0
business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxApiController.java

@@ -58,4 +58,10 @@ public class ZhcxApiController {
         return r;
     }
 
+    @RequestMapping("/getCoreInspectionDetailList")
+    public R getCoreInspectionDetailList(@RequestBody Map<String,Object> map){
+        R r = zhcxApiService.getCoreInspectionDetailList(map);
+        return r;
+    }
+
 }