農家インターフェース修正

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/master/domain/bo/MastFarmerBo.java

@@ -41,7 +41,7 @@ public class MastFarmerBo implements Serializable {
     /**
      * 農家名（カナ）
      */
-    @LmNotBlank(params = {"{farmerNameKn}"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
+
     @LmLength(min = 1, max = 32, params = {"{farmerNameKn}", "32"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
     @LmType(params = {"{farmerNameKn}", "{kana}"}, checkType = CheckTypeEnum.KANA, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
     private String farmerNameKn;
@@ -74,7 +74,7 @@ public class MastFarmerBo implements Serializable {
     private String city;
 
     /**
-     * 住所
+     * 町域・番地
      */
     @LmLength(min = 1, max = 20, params = {"{townStreetArea}", "20"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
     private String townStreetArea;
@@ -88,6 +88,7 @@ public class MastFarmerBo implements Serializable {
     /**
      * 住所
      */
+    @LmNotBlank(params = {"{address}"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
     @LmLength(min = 1, max = 256, params = {"{address}", "256"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
     private String address;
 

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/master/service/impl/MastFarmerServiceImpl.java

@@ -1,5 +1,6 @@
 package jp.yamoto.farm.crm.biz.master.service.impl;
 
+import jp.yamoto.farm.common.biz.service.ISysConfigService;
 import jp.yamoto.farm.common.core.domain.model.LoginUser;
 import jp.yamoto.farm.common.core.enums.DelFlgEnum;
 import jp.yamoto.farm.common.exception.ServiceException;
@@ -18,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Random;
 
 /**
  * 農家マスタ Service業務処理
@@ -30,6 +32,8 @@ public class MastFarmerServiceImpl implements IMastFarmerService {
     @Autowired
     private MastFarmerMapper mastFarmerMapper;
 
+    @Autowired
+    private ISysConfigService sysConfigService;
     /**
      * 農家マスタの検索
      *
@@ -162,13 +166,15 @@ public class MastFarmerServiceImpl implements IMastFarmerService {
             mastFarmer.setIssuedBy(loginUser.getUsername());
             // 発行日
             mastFarmer.setIssuedDate(DateUtils.getDate());
+
+            // パスワード
+            //
+            String defaultPwd = generateFarmerInitPwd();
+            mastFarmer.setUserPassword(defaultPwd);
+//            mastFarmer.setUserPassword(SecurityUtils.encryptPassword(mastFarmer.getUserPassword()));
         }
 
         // データを暗号化
-        // パスワード
-        if (mastFarmer.getUserPassword() != null && !mastFarmer.getUserPassword().isEmpty()) {
-            mastFarmer.setUserPassword(SecurityUtils.encryptPassword(mastFarmer.getUserPassword()));
-        }
         // らくうるカートパスワード
         if (ValueUtils.isNotEmpty(mastFarmer.getRakuuruCartPwd())) {
             mastFarmer.setRakuuruCartPwd(SecurityUtils.encryptPassword(mastFarmer.getRakuuruCartPwd()));
@@ -199,4 +205,23 @@ public class MastFarmerServiceImpl implements IMastFarmerService {
 //        mastFarmerVo.setPhoneNumber(PhoneNumber);
     }
 
+    /**
+     * 初期パスワードを生成
+     * @return パスワード
+     */
+    private String generateFarmerInitPwd() {
+        // 定义包含大小写字母和数字的字符池
+        String charPool = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+        StringBuilder password = new StringBuilder();
+        Random random = new Random();
+
+        for (int i = 0; i < 6; i++) {
+            // 从字符池中随机选择一个字符
+            int index = random.nextInt(charPool.length());
+            password.append(charPool.charAt(index));
+        }
+
+        return password.toString();
+    }
+
 }

farm-crm/src/main/resources/i18n/messages.properties

@@ -78,9 +78,11 @@ I0009=\u30ED\u30B0\u30A2\u30A6\u30C8\u3057\u307E\u3057\u305F\u3002
 label.farmerId=\u8FB2\u5BB6ID
 label.farmerName=\u8FB2\u5BB6\u540D
 label.farmerNameKn=\u8FB2\u5BB6\u540D\uFF08\u30AB\u30CA\uFF09
-label.phoneNumber=\u96FB\u8A71\u756A\u53F7
+
 label.rakuuruCartId=\u3089\u304F\u3046\u308B\u30AB\u30FC\u30C8ID
 label.rakuuruCartPwd=\u3089\u304F\u3046\u308B\u30AB\u30FC\u30C8\u30D1\u30B9\u30EF\u30FC\u30C9
+label.representativeName=\u4EE3\u8868\u8005\u540D
+label.representativeNameKn=\u4EE3\u8868\u8005\u540D\uFF08\u30AB\u30CA\uFF09
 
 label.branchNo=\u679D\u756A
 label.orderNo=\u4E26\u3073\u9806
@@ -116,4 +118,6 @@ label.parameterInvalid=\u30D1\u30E9\u30E1\u30FC\u30BF\u30A8\u30E9\u30FC
 label.forbidden=\u9077\u79FB\u5143\u30B7\u30B9\u30C6\u30E0ID\u4E0D\u6B63
 label.authenticateError=\u8A8D\u8A3C\u30A8\u30E9\u30FC
 label.newAdd=\u65B0\u898F\u767B\u9332
-label.edit=\u7DE8\u96C6
+label.edit=\u7DE8\u96C6
+label.address=\u4F4F\u6240
+label.phoneNumber=\u96FB\u8A71\u756A\u53F7