user

farm-common/src/main/java/jp/yamoto/farm/common/core/domain/entity/SysUser.java

@@ -34,7 +34,7 @@ public class SysUser extends BaseEntity
      * ユーザーアカウント
      */
     @DecryptField
-    @Excel(name = "アカウント")
+    @Excel(name = "ユーザID")
     @LmNotBlank(params = {"{userName}"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
     @LmLength(min = 1, max = 100, params = {"{userName}", "100"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
     @LmType(params = {"{userName}", "{halfAlphabetNumericSymbol}"}, checkType = CheckTypeEnum.ALPHABET_NUMERIC_SYMBOL, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
@@ -44,7 +44,7 @@ public class SysUser extends BaseEntity
      * ユーザー名称
      */
     @DecryptField
-    @Excel(name = "ユーザー名称")
+    @Excel(name = "ユーザ名")
     @LmNotBlank(params = {"{nickName}"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
     @LmLength(min = 1, max = 30, params = {"{nickName}", "30"}, message = "{E0051}", groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
     private String nickName;
@@ -71,7 +71,6 @@ public class SysUser extends BaseEntity
     /**
      * パスワード
      */
-    @DecryptField
     @LmNotBlank(params = {"{password}"}, groups = {ValidatorGroup.AddGroup.class})
     @LmLength(min = 8, max = 20, params = {"{password}"}, message = "{E0002}", groups = {ValidatorGroup.AddGroup.class})
     @LmPassword(params = {"{password}"}, message = "{E0002}", groups = {ValidatorGroup.AddGroup.class})

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/master/domain/entity/MastUser.java

@@ -0,0 +1,65 @@
+package jp.yamoto.farm.crm.biz.master.domain.entity;
+
+import jp.yamoto.farm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * ユーザーマスタ (mast_user)
+ *
+ * @author nextosd
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class MastUser extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * ユーザーコード
+     */
+    private String userCd;
+
+    /**
+     * パスワード
+     */
+    private String userPwd;
+
+    /**
+     * ユーザ名
+     */
+    private String userName;
+
+    /**
+     * オペレーター権限
+     */
+    private String operatoAuth;
+
+    /**
+     * 電話番号
+     */
+    private String phonenumber;
+
+    /**
+     * 廃止フラグ
+     */
+    private String discontinuedFlg;
+
+    /**
+     * 廃止日
+     */
+    private String discontinuedDate;
+
+    /**
+     * リビジョン
+     */
+    private Integer version;
+}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/sys/service/impl/SysUserServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 import jakarta.validation.Validator;
 import jp.yamoto.farm.common.utils.MessageUtils;
+import jp.yamoto.farm.common.utils.ValueUtils;
 import jp.yamoto.farm.crm.biz.sys.mapper.SysRoleMapper;
 import jp.yamoto.farm.crm.biz.sys.mapper.SysUserMapper;
 import jp.yamoto.farm.crm.biz.sys.mapper.SysUserRoleMapper;
@@ -230,6 +231,14 @@ public class SysUserServiceImpl implements ISysUserService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int insertUser(SysUser user) {
+        user.setCreateBy(SecurityUtils.getLoginUser().getUsername());
+        String password = user.getPassword();
+        if(ValueUtils.isEmpty(user.getPassword())) {
+             password = configService.selectConfigByKey("sys.user.initPassword");
+        }
+
+        user.setPassword(SecurityUtils.encryptPassword(password));
+
         // 新規ユーザー情報を追加
         int rows = userMapper.insertUser(user);
         insertUserRoleByRoleId(user);

farm-crm/pom.xml

@@ -42,6 +42,11 @@
             <groupId>jp.yamoto</groupId>
             <artifactId>farm-crm-biz</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>jp.yamoto</groupId>
+            <artifactId>farm-quartz</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

farm-crm/src/main/java/jp/yamoto/farm/crm/web/controller/system/SysUserController.java

@@ -112,7 +112,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:add')")
     @Log(title = "ユーザー管理", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     public AjaxResult add(@RequestBody @Validated({ValidatorGroup.AddGroup.class}) SysUser user)
     {
         roleService.checkRoleDataScope(user.getRoleIds());
@@ -129,7 +129,6 @@ public class SysUserController extends BaseController
             return error("新規ユーザー'" + user.getUserName() + "'失敗しました。メールアカウントは既に存在します");
         }
         user.setCreateBy(getUsername());
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         return toAjax(userService.insertUser(user));
     }
 
@@ -138,7 +137,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "ユーザー管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/update")
     public AjaxResult edit(@Validated @RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);

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

@@ -112,8 +112,8 @@ label.listDisplayItem=\u4E00\u89A7\u8868\u793A\u9805\u76EE
 label.mailAddress=\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9
 label.roleName=\u30ED\u30FC\u30EB\u540D
 label.remark=\u5099\u8003
-label.userName=\u30A2\u30AB\u30A6\u30F3\u30C8
-label.nickName=\u30E6\u30FC\u30B6\u30FC\u540D\u79F0
+label.userName=\u30E6\u30FC\u30B6\u30FCID
+label.nickName=\u30E6\u30FC\u30B6\u30FC\u540D
 label.password=\u30D1\u30B9\u30EF\u30FC\u30C9
 label.role=\u30ED\u30FC\u30EB
 label.attachInfoConnect=\u7D10\u4ED8\u3051