共通 ビジネス

farm-common-biz/pom.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>jp.yamoto</groupId>
+        <artifactId>farm</artifactId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>farm-common-biz</artifactId>
+
+    <description>
+        共通 ビジネス処理
+    </description>
+
+    <dependencies>
+
+        <!-- Common -->
+        <dependency>
+            <groupId>jp.yamoto</groupId>
+            <artifactId>farm-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>

farm-common-biz/src/main/java/jp/yamoto/farm/common/biz/constants/FarmConstants.java

@@ -0,0 +1,7 @@
+package jp.yamoto.farm.common.biz.constants;
+
+/**
+ * 農家支援 & CRM システム 共通定数情報
+ */
+public class FarmConstants {
+}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/sys/domain/SysCache.java

@@ -1,4 +1,4 @@
-package jp.yamoto.farm.crm.biz.sys.domain;
+package jp.yamoto.farm.common.biz.domain;
 
 import jp.yamoto.farm.common.utils.StringUtils;
 

farm-common-biz/src/main/java/jp/yamoto/farm/common/biz/domain/bo/OptionsParamBo.java

@@ -0,0 +1,42 @@
+package jp.yamoto.farm.common.biz.domain.bo;
+
+import lombok.Data;
+
+/**
+ * オプションの検索条件
+ *
+ * @author nextosd
+ */
+@Data
+public class OptionsParamBo {
+
+    /**
+     * コンボボックス定数
+     */
+    private String cmdOptionName;
+
+    /**
+     * 取得条件1
+     */
+    private String conditionValue1;
+
+    /**
+     * 取得条件2
+     */
+    private String conditionValue2;
+
+    /**
+     * 取得条件3
+     */
+    private String conditionValue3;
+
+    /**
+     * 取得条件4
+     */
+    private String conditionValue4;
+
+    /**
+     * 取得条件5
+     */
+    private String conditionValue5;
+}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/sys/domain/SysConfig.java

@@ -1,4 +1,4 @@
-package jp.yamoto.farm.crm.biz.sys.domain;
+package jp.yamoto.farm.common.biz.domain.entity;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;

farm-common-biz/src/main/java/jp/yamoto/farm/common/biz/domain/vo/OptionsKeyValueVo.java

@@ -0,0 +1,48 @@
+package jp.yamoto.farm.common.biz.domain.vo;
+
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * コンボボックスのオプション対象
+ *
+ * @author nextosd
+ */
+@Builder
+@Data
+public class OptionsKeyValueVo {
+    /**
+     * オプションのキー
+     */
+    private String key;
+
+    /**
+     * オプションの表示値
+     */
+    private String value;
+
+    /**
+     * スペア１
+     */
+    private String spare1;
+
+    /**
+     * スペア2
+     */
+    private String spare2;
+
+    /**
+     * スペア3
+     */
+    private String spare3;
+
+    /**
+     * スペア4
+     */
+    private String spare4;
+
+    /**
+     * スペア5
+     */
+    private String spare5;
+}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/sys/mapper/SysConfigMapper.java

@@ -1,8 +1,8 @@
-package jp.yamoto.farm.crm.biz.sys.mapper;
+package jp.yamoto.farm.common.biz.mapper;
 
-import java.util.List;
+import jp.yamoto.farm.common.biz.domain.entity.SysConfig;
 
-import jp.yamoto.farm.crm.biz.sys.domain.SysConfig;
+import java.util.List;
 
 /**
  * システムパラメータ 数据层

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/sys/mapper/SysDictDataMapper.java

@@ -1,4 +1,4 @@
-package jp.yamoto.farm.crm.biz.sys.mapper;
+package jp.yamoto.farm.common.biz.mapper;
 
 import java.util.List;
 

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/sys/mapper/SysDictTypeMapper.java

@@ -1,4 +1,4 @@
-package jp.yamoto.farm.crm.biz.sys.mapper;
+package jp.yamoto.farm.common.biz.mapper;
 
 import java.util.List;
 import jp.yamoto.farm.common.core.domain.entity.SysDictType;

farm-common-biz/src/main/java/jp/yamoto/farm/common/biz/service/IFarmCommonService.java

@@ -0,0 +1,23 @@
+package jp.yamoto.farm.common.biz.service;
+
+import jp.yamoto.farm.common.biz.domain.bo.OptionsParamBo;
+import jp.yamoto.farm.common.biz.domain.vo.OptionsKeyValueVo;
+
+import java.util.List;
+
+/**
+ * 共通 Serviceインタフェース
+ *
+ * @author nextosd
+ */
+public interface IFarmCommonService {
+
+    /**
+     * コンボボックスデータを取得する
+     *
+     * @param optionsParam
+     * @return
+     */
+    public List<OptionsKeyValueVo> getCommonOptions(OptionsParamBo optionsParam);
+
+}

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

@@ -1,8 +1,8 @@
-package jp.yamoto.farm.crm.biz.sys.service;
+package jp.yamoto.farm.common.biz.service;
 
-import java.util.List;
+import jp.yamoto.farm.common.biz.domain.entity.SysConfig;
 
-import jp.yamoto.farm.crm.biz.sys.domain.SysConfig;
+import java.util.List;
 
 /**
  * パラメータ設定 サービス層

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

@@ -1,4 +1,4 @@
-package jp.yamoto.farm.crm.biz.sys.service;
+package jp.yamoto.farm.common.biz.service;
 
 import java.util.List;
 import jp.yamoto.farm.common.core.domain.entity.SysDictData;

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

@@ -1,4 +1,4 @@
-package jp.yamoto.farm.crm.biz.sys.service;
+package jp.yamoto.farm.common.biz.service;
 
 import java.util.List;
 import jp.yamoto.farm.common.core.domain.entity.SysDictData;

farm-common-biz/src/main/java/jp/yamoto/farm/common/biz/service/impl/FarmCommonService.java

@@ -0,0 +1,28 @@
+package jp.yamoto.farm.common.biz.service.impl;
+
+import jp.yamoto.farm.common.biz.domain.bo.OptionsParamBo;
+import jp.yamoto.farm.common.biz.domain.vo.OptionsKeyValueVo;
+import jp.yamoto.farm.common.biz.service.IFarmCommonService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 共通ロジックのサービスクラス
+ *
+ * @author nextosd
+ */
+@Service
+public class FarmCommonService implements IFarmCommonService {
+
+    /**
+     * コンボボックスデータを取得する
+     *
+     * @param optionsParam
+     * @return
+     */
+    @Override
+    public List<OptionsKeyValueVo> getCommonOptions(OptionsParamBo optionsParam) {
+        return null;
+    }
+}

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

@@ -1,11 +1,11 @@
-package jp.yamoto.farm.crm.biz.sys.service.impl;
+package jp.yamoto.farm.common.biz.service.impl;
 
 import java.util.Collection;
 import java.util.List;
 import jakarta.annotation.PostConstruct;
-import jp.yamoto.farm.crm.biz.sys.mapper.SysConfigMapper;
-import jp.yamoto.farm.crm.biz.sys.service.ISysConfigService;
-import jp.yamoto.farm.crm.biz.sys.domain.SysConfig;
+import jp.yamoto.farm.common.biz.domain.entity.SysConfig;
+import jp.yamoto.farm.common.biz.mapper.SysConfigMapper;
+import jp.yamoto.farm.common.biz.service.ISysConfigService;
 import jp.yamoto.farm.common.constant.CacheConstants;
 import jp.yamoto.farm.common.constant.UserConstants;
 import jp.yamoto.farm.common.cache.AppCache;

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

@@ -1,9 +1,9 @@
-package jp.yamoto.farm.crm.biz.sys.service.impl;
+package jp.yamoto.farm.common.biz.service.impl;
 
 import java.util.List;
 
-import jp.yamoto.farm.crm.biz.sys.mapper.SysDictDataMapper;
-import jp.yamoto.farm.crm.biz.sys.service.ISysDictDataService;
+import jp.yamoto.farm.common.biz.mapper.SysDictDataMapper;
+import jp.yamoto.farm.common.biz.service.ISysDictDataService;
 import jp.yamoto.farm.common.core.domain.entity.SysDictData;
 import jp.yamoto.farm.common.utils.DictUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,13 +1,13 @@
-package jp.yamoto.farm.crm.biz.sys.service.impl;
+package jp.yamoto.farm.common.biz.service.impl;
 
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import jakarta.annotation.PostConstruct;
-import jp.yamoto.farm.crm.biz.sys.mapper.SysDictDataMapper;
-import jp.yamoto.farm.crm.biz.sys.mapper.SysDictTypeMapper;
-import jp.yamoto.farm.crm.biz.sys.service.ISysDictTypeService;
+import jp.yamoto.farm.common.biz.mapper.SysDictDataMapper;
+import jp.yamoto.farm.common.biz.mapper.SysDictTypeMapper;
+import jp.yamoto.farm.common.biz.service.ISysDictTypeService;
 import jp.yamoto.farm.common.constant.UserConstants;
 import jp.yamoto.farm.common.core.domain.entity.SysDictData;
 import jp.yamoto.farm.common.core.domain.entity.SysDictType;

farm-crm-biz/src/main/resources/mapper/crm/SysConfigMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="jp.yamoto.farm.crm.biz.sys.mapper.SysConfigMapper">
+<mapper namespace="jp.yamoto.farm.common.biz.mapper.SysConfigMapper">
     
     <resultMap type="SysConfig" id="SysConfigResult">
     	<id     property="configId"      column="config_id"      />

farm-crm-biz/src/main/resources/mapper/crm/SysDictDataMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="jp.yamoto.farm.crm.biz.sys.mapper.SysDictDataMapper">
+<mapper namespace="jp.yamoto.farm.common.biz.mapper.SysDictDataMapper">
 	
 	<resultMap type="SysDictData" id="SysDictDataResult">
 		<id     property="dictCode"   column="dict_code"   />

farm-crm-biz/src/main/resources/mapper/crm/SysDictTypeMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="jp.yamoto.farm.crm.biz.sys.mapper.SysDictTypeMapper">
+<mapper namespace="jp.yamoto.farm.common.biz.mapper.SysDictTypeMapper">
 
 	<resultMap type="SysDictType" id="SysDictTypeResult">
 		<id     property="dictId"     column="dict_id"     />

farm-crm-biz/pom.xml

@@ -17,10 +17,10 @@
 
     <dependencies>
 
-        <!-- Common -->
+        <!-- Common biz-->
         <dependency>
             <groupId>jp.yamoto</groupId>
-            <artifactId>farm-common</artifactId>
+            <artifactId>farm-common-biz</artifactId>
         </dependency>
 
         <dependency>

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/constants/CrmConstants.java

@@ -0,0 +1,7 @@
+package jp.yamoto.farm.crm.biz.constants;
+
+/**
+ * CRM システム 共通定数情報
+ */
+public class CrmConstants {
+}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/enums/CmdOptionEnum.java

@@ -0,0 +1,33 @@
+package jp.yamoto.farm.crm.biz.enums;
+
+import lombok.Getter;
+
+/**
+ * コンボボックス共通定数
+ *
+ * @author nextosd
+ */
+@Getter
+public enum CmdOptionEnum {
+
+    /**
+     * CMB001:農家名検索コンボ取得
+     */
+    CMB001("CMB001"),
+
+    /**
+     * CMB002:お問い合わせ内容 カテゴリ（大）コンボ取得
+     */
+    CMB002("CMB002"),
+
+    /**
+     * CMB002:お問い合わせ内容 カテゴリ（中）コンボ取得
+     */
+    CMB003("CMB003");
+
+    private final String code;
+
+    CmdOptionEnum(final String code) {
+        this.code = code;
+    }
+}

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

@@ -1,116 +0,0 @@
-package jp.yamoto.farm.crm.biz.master.domain.bo;
-
-import jp.yamoto.farm.common.validator.annotation.*;
-import jp.yamoto.farm.common.validator.enums.CheckTypeEnum;
-import jp.yamoto.farm.common.validator.utils.ValidatorGroup;
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 顧客マスタ サービスパラメータ対象
- *
- * @author nextosd
- */
-@Data
-public class MastOksBo implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 汎用ID
-     */
-    private String id;
-
-    /**
-     * 顧客CD
-     */
-    @LmNotBlank(params = {"{oksCd}"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
-    @LmLength(min = 1, max = 20, params = {"{oksCd}", "20"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
-    private String oksCd;
-
-    /**
-     * 顧客様氏名
-     */
-    @LmNotBlank(params = {"{oksMei}"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
-    @LmLength(min = 1, max = 64, params = {"{oksMei}", "64"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
-    private String oksMei;
-
-    /**
-     * 顧客様氏名（カナ）
-     */
-    @LmNotBlank(params = {"{oksMeiKn}"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
-    @LmLength(min = 1, max = 32, params = {"{oksMeiKn}", "32"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
-    @LmType(params = {"{oksMeiKn}", "{kana}"}, checkType = CheckTypeEnum.KANA, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
-    private String oksMeiKn;
-
-    /**
-     * 都道府県
-     */
-    @LmNotBlank(params = {"{todoFuken}"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
-    @LmLength(min = 1, max = 56, params = {"{todoFuken}", "56"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
-    private String todoFuken;
-
-    /**
-     * 市区町村
-     */
-    @LmNotBlank(params = {"{shikuChoson}"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
-    @LmLength(min = 1, max = 56, params = {"{shikuChoson}", "56"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
-    private String shikuChoson;
-
-    /**
-     * 番地以下
-     */
-    @LmLength(min = 1, max = 256, params = {"{banchiika}", "256"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
-    private String banchiIka;
-
-    /**
-     * 電話番号
-     */
-    @LmLength(min = 1, max = 14, params = {"{tenwabango}", "14"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
-    @LmPhoneNo(params = {"{tenwabango}"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
-    private String tenwabango;
-
-    /**
-     * 郵便番号
-     */
-    @LmLength(min = 1, max = 8, params = {"{yubenbango}", "8"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
-    private String yubenbango;
-
-    /**
-     * メールアドレス
-     */
-    @LmNotBlank(params = {"{mailAddress}"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
-    @LmLength(min = 1, max = 128, params = {"{mailAddress}", "128"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
-    @LmMail(params = {"{mailAddress}"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
-    private String mailAddress;
-
-    /**
-     * 農家ID
-     */
-    @LmNotBlank(params = {"{nokaCd}"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
-    @LmLength(min = 1, max = 20, params = {"{nokaCd}", "20"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
-    private String nokaCd;
-
-    /**
-     * 廃止フラグ
-     */
-    private Integer haisiFlg;
-
-    /**
-     * 廃止日
-     */
-    private String haisiDt;
-
-    /**
-     * 廃止理由
-     */
-    private String haisiRiyu;
-
-    /**
-     * リビジョン
-     */
-    private Integer version;
-}

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

@@ -1,90 +0,0 @@
-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_oks)
- *
- * @author nextosd
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class MastOks extends BaseEntity{
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 顧客ID
-     */
-    private String oksCd;
-
-    /**
-     * お客様氏名
-     */
-    private String oksMei;
-
-    /**
-     * お客様氏名（カナ）
-     */
-    private String oksMeiKn;
-
-    /**
-     * 都道府県
-     */
-    private String todoFuken;
-
-    /**
-     * 市区町村
-     */
-    private String shikuChoson;
-
-    /**
-     * 番地以下
-     */
-    private String banchiIka;
-
-    /**
-     * 電話番号
-     */
-    private  String tenwabango;
-
-    /**
-     * 郵便番号
-     */
-    private  String yubenbango;
-
-    /**
-     * メールアドレス
-     */
-    private String mailAddress;
-
-    /**
-     * 農家ID
-     */
-    private String nokaCd;
-
-    /**
-     * 廃止フラグ
-     */
-    private Integer haisiFlg;
-
-    /**
-     * 廃止日
-     */
-    private  String haisiDt;
-
-    /**
-     * 廃止理由
-     */
-    private String haisiRiyu;
-
-    /**
-     * リビジョン
-     */
-    private Integer version;
-}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/master/domain/vo/MastOksVo.java

@@ -1,82 +0,0 @@
-package jp.yamoto.farm.crm.biz.master.domain.vo;
-
-import lombok.Data;
-
-/**
- * 顧客マスタ詳細情報Vo
- *
- * @author nextosd
- */
-@Data
-public class MastOksVo {
-
-    /**
-     * 顧客CD
-     */
-    private String oksCd;
-
-    /**
-     * お客様氏名
-     */
-    private String oksMei;
-
-    /**
-     * お客様氏名（カナ）
-     */
-    private String oksMeiKn;
-
-    /**
-     * 都道府県
-     */
-    private String todoFuken;
-
-    /**
-     * 市区町村
-     */
-    private String shikuChoson;
-
-    /**
-     * 番地以下
-     */
-    private String banchiIka;
-
-    /**
-     * 電話番号
-     */
-    private  String tenwabango;
-
-    /**
-     * 郵便番号
-     */
-    private  String yubenbango;
-
-    /**
-     * メールアドレス
-     */
-    private String mailAddress;
-
-    /**
-     * 農家ID
-     */
-    private String nokaCd;
-
-    /**
-     * 廃止フラグ
-     */
-    private Integer haisiFlg;
-
-    /**
-     * 廃止日
-     */
-    private  String haisiDt;
-
-    /**
-     * 廃止理由
-     */
-    private String haisiRiyu;
-
-    /**
-     * リビジョン
-     */
-    private Integer version;
-}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/master/mapper/MastOksMapper.java

@@ -1,78 +0,0 @@
-package jp.yamoto.farm.crm.biz.master.mapper;
-
-import jp.yamoto.farm.crm.biz.master.domain.entity.MastOks;
-import jp.yamoto.farm.crm.biz.master.domain.vo.MastOksVo;
-
-import java.util.List;
-
-/**
- * 顧客マスタ Mapperインタフェース
- *
- * @author nextosd
- */
-public interface MastOksMapper {
-
-    /**
-     * 顧客マスタを検索
-     *
-     * @param id 顧客マスタプライマリ・キー
-     * @return 顧客マスタ
-     */
-    public MastOks selectById(String id);
-
-    /**
-     * 顧客マスタを検索リスト
-     *
-     * @param mastOks 顧客マスタ
-     * @return 顧客マスタリスト
-     */
-    public List<MastOksVo> selectList(MastOks mastOks);
-
-    /**
-     * 顧客CDの件数のクエリ
-     *
-     * @param oksCd 顧客ID
-     * @return 結果
-     */
-    public int getOksCdCount(String oksCd);
-
-    /**
-     * 顧客マスタを登録
-     *
-     * @param mastOks 顧客マスタ
-     * @return 結果
-     */
-    public int insert(MastOks mastOks);
-
-    /**
-     * 顧客マスタを修正
-     *
-     * @param mastOks 顧客マスタ
-     * @return 結果
-     */
-    public int update(MastOks mastOks);
-
-    /**
-     * 顧客マスタを削除
-     *
-     * @param id 顧客マスタプライマリ・キー
-     * @return 結果
-     */
-    public int deleteById(String id);
-
-    /**
-     * 顧客マスタの一括削除
-     *
-     * @param ids 削除する必要があるデータ・プライマリ・キー・コレクション
-     * @return 結果
-     */
-    public int deleteByIds(String[] ids);
-
-    /**
-     * 一覧表示項目スタの論理削除
-     *
-     * @param mastOks 一覧表示項目
-     * @return 結果
-     */
-    public int deleteLogicByIdAndVersion(MastOks mastOks);
-}

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

@@ -1,55 +0,0 @@
-package jp.yamoto.farm.crm.biz.master.service;
-
-import jp.yamoto.farm.crm.biz.master.domain.bo.MastOksBo;
-import jp.yamoto.farm.crm.biz.master.domain.entity.MastOks;
-import jp.yamoto.farm.crm.biz.master.domain.vo.MastOksVo;
-
-import java.util.List;
-
-/**
- * 顧客マスタ Serviceインタフェース
- *
- * @author nextosd
- */
-public interface IMastOksService {
-
-    /**
-     * 顧客マスタの検索
-     *
-     * @param id 顧客マスタプライマリ・キー
-     * @return 顧客マスタ
-     */
-    public MastOksVo selectById(String id);
-
-    /**
-     * 顧客マスタのリストを検索
-     *
-     * @param mastOksBo 顧客マスタパラメータ対象
-     * @return 顧客マスタリスト
-     */
-    public List<MastOksVo> selectList(MastOksBo mastOksBo);
-
-    /**
-     * 顧客マスタの追加
-     *
-     * @param mastOksBo 顧客マスタパラメータ対象
-     * @return 結果
-     */
-    public int insert(MastOksBo mastOksBo);
-
-    /**
-     * 顧客マスタの修正
-     *
-     * @param mastOksBo 顧客マスタパラメータ対象
-     * @return 結果
-     */
-    public int update(MastOksBo mastOksBo);
-
-    /**
-     * 顧客マスタの一括削除
-     *
-     * @param mastOks 顧客マスタ
-     * @return 結果
-     */
-    public int deleteLogicByIdAndVersion(MastOks mastOks);
-}

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

@@ -1,119 +0,0 @@
-package jp.yamoto.farm.crm.biz.master.service.impl;
-
-import jp.yamoto.farm.common.core.enums.DelFlgEnum;
-import jp.yamoto.farm.common.exception.ServiceException;
-import jp.yamoto.farm.common.utils.MessageUtils;
-import jp.yamoto.farm.common.utils.SecurityUtils;
-import jp.yamoto.farm.crm.biz.master.domain.bo.MastOksBo;
-import jp.yamoto.farm.crm.biz.master.domain.entity.MastOks;
-import jp.yamoto.farm.crm.biz.master.domain.vo.MastNokaVo;
-import jp.yamoto.farm.crm.biz.master.domain.vo.MastOksVo;
-import jp.yamoto.farm.crm.biz.master.mapper.MastOksMapper;
-import jp.yamoto.farm.crm.biz.master.service.IMastOksService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * 顧客マスタ Service業務処理
- *
- * @author nextosd
- */
-@Service
-public class MastOksServiceImpl implements IMastOksService {
-
-    @Autowired
-    private MastOksMapper mastOksMapper;
-
-    /**
-     * 顧客マスタの検索
-     *
-     * @param id 顧客マスタプライマリ・キー
-     * @return 顧客マスタ
-     */
-    @Override
-    public MastOksVo selectById(String id) {
-        MastOks MastOks = mastOksMapper.selectById(id);
-
-        if (MastOks == null) {
-            throw new ServiceException(MessageUtils.message("E0007"));
-        }
-        MastOksVo item = new MastOksVo();
-        BeanUtils.copyProperties(MastOks, item);
-        return item;
-    }
-
-    /**
-     * 顧客マスタのリストを検索
-     *
-     * @param mastOksBo 顧客マスタパラメータ対象
-     * @return 顧客マスタリスト
-     */
-    @Override
-    public List<MastOksVo> selectList(MastOksBo mastOksBo) {
-        // 未削除フラグ設定
-        mastOksBo.setHaisiFlg(DelFlgEnum.OFF.getCode());
-        MastOks mastOks = new MastOks();
-        BeanUtils.copyProperties(mastOksBo, mastOks);
-        return mastOksMapper.selectList(mastOks);
-    }
-
-    /**
-     * 顧客マスタの追加
-     *
-     * @param mastOksBo 顧客マスタパラメータ対象
-     * @return 結果
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public int insert(MastOksBo mastOksBo) {
-        MastOks mastOks = new MastOks();
-        BeanUtils.copyProperties(mastOksBo, mastOks);
-
-        // 顧客コードの重複チェック
-        int mastOksCount = mastOksMapper.getOksCdCount(mastOksBo.getOksCd());
-        if (mastOksCount > 0) {
-            throw new ServiceException(MessageUtils.message("E0001", MessageUtils.message("label.oksCd")));
-        }
-
-        return mastOksMapper.insert(mastOks);
-    }
-
-    /**
-     * 顧客マスタの編集
-     *
-     * @param mastOksBo 顧客マスタパラメータ対象
-     * @return 結果
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public int update(MastOksBo mastOksBo) {
-        MastOks mastOks = new MastOks();
-        BeanUtils.copyProperties(mastOksBo, mastOks);
-        int result = mastOksMapper.update(mastOks);
-        if (result < 1) {
-            throw new ServiceException(MessageUtils.message("E0007"));
-        }
-        return result;
-    }
-
-    /**
-     * 顧客マスタの論理削除
-     *
-     * @param mastOks 顧客マスタ
-     * @return 結果
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public int deleteLogicByIdAndVersion(MastOks mastOks) {
-        // 該当データは既に別のユーザーより削除されました。
-        int result = mastOksMapper.deleteLogicByIdAndVersion(mastOks);
-        if (result < 1) {
-            throw new ServiceException(MessageUtils.message("E0007"));
-        }
-        return result;
-    }
-}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/sys/security/SysLoginService.java

@@ -3,7 +3,7 @@ package jp.yamoto.farm.crm.biz.sys.security;
 import jakarta.annotation.Resource;
 import jp.yamoto.farm.common.config.AppConfig;
 import jp.yamoto.farm.common.utils.ConvertUtils;
-import jp.yamoto.farm.crm.biz.sys.service.ISysConfigService;
+import jp.yamoto.farm.common.biz.service.ISysConfigService;
 import jp.yamoto.farm.crm.biz.sys.service.ISysUserService;
 import jp.yamoto.farm.common.constant.Constants;
 import jp.yamoto.farm.common.constant.UserConstants;

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/sys/security/SysRegisterService.java

@@ -2,7 +2,7 @@ package jp.yamoto.farm.crm.biz.sys.security;
 
 import jp.yamoto.farm.common.cache.AppCache;
 import jp.yamoto.farm.common.config.AppConfig;
-import jp.yamoto.farm.crm.biz.sys.service.ISysConfigService;
+import jp.yamoto.farm.common.biz.service.ISysConfigService;
 import jp.yamoto.farm.crm.biz.sys.service.ISysUserService;
 import jp.yamoto.farm.common.constant.CacheConstants;
 import jp.yamoto.farm.common.constant.Constants;

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

@@ -8,7 +8,7 @@ import jp.yamoto.farm.common.utils.MessageUtils;
 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;
-import jp.yamoto.farm.crm.biz.sys.service.ISysConfigService;
+import jp.yamoto.farm.common.biz.service.ISysConfigService;
 import jp.yamoto.farm.crm.biz.sys.service.ISysUserService;
 import jp.yamoto.farm.crm.biz.sys.domain.SysUserRole;
 import jp.yamoto.farm.common.constant.UserConstants;

farm-crm-biz/src/main/resources/mapper/crm/MastOksMapper.xml

@@ -1,286 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="jp.yamoto.farm.crm.biz.master.mapper.MastOksMapper">
-
-    <resultMap type="MastOks" id="MastOksResult">
-        <result property="oksCd" column="oks_cd"/>
-        <result property="oksMei" column="oks_mei"/>
-        <result property="oksMeiKn" column="oks_mei_kn"/>
-        <result property="tenwabango" column="tenwabango"/>
-        <result property="mailAddress" column="mail_address"/>
-        <result property="haisiFlg" column="haisi_flg"/>
-        <result property="haisiDt" column="haisi_dt"/>
-        <result property="haisiRiyu" column="haisi_riyu"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="createPgId" column="create_pg_id"/>
-        <result property="updatePgId" column="update_pg_id"/>
-        <result property="version" column="version"/>
-        <result property="todoFuken" column="todo_fuken"/>
-        <result property="shikuChoson" column="shiku_choson"/>
-        <result property="banchiIka" column="banchi_ika"/>
-        <result property="yubenbango" column="yubenbango"/>
-        <result property="nokaCd" column="noka_cd"/>
-    </resultMap>
-
-    <sql id="selectMastOksVo">
-        select
-        oks_cd,
-        oks_mei,
-        oks_mei_kn,
-        tenwabango,
-        mail_address,
-        haisi_flg,
-        haisi_dt,
-        haisi_riyu,
-        create_time,
-        create_by,
-        create_pg_id,
-        update_time,
-        update_by,
-        update_pg_id,
-        version,
-        todo_fuken,
-        shiku_choson,
-        banchi_ika,
-        yubenbango,
-        noka_cd
-        from mast_okyakusama
-    </sql>
-
-    <select id="selectList" parameterType="MastOks" resultMap="MastOksResult">
-        <include refid="selectMastOksVo"/>
-        <where>
-            <if test="oksCd != null  and oksCd != ''">
-                and oks_cd = #{oksCd}
-            </if>
-            <if test="oksMei != null  and oksMei != ''">
-                and oks_mei like '%' || #{oksMei} || '%'
-            </if>
-            <if test="haisiFlg != null">
-                and haisi_flg = #{haisiFlg}
-            </if>
-        </where>
-        order by oks_cd asc
-    </select>
-
-    <select id="selectById" parameterType="String" resultMap="MastOksResult">
-        <include refid="selectMastOksVo"/>
-        where oks_cd = #{oksCd}
-    </select>
-
-    <insert id="insert" parameterType="MastOks">
-        insert into mast_okyakusama
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="oksCd != null">
-                oks_cd,
-            </if>
-            <if test="oksMei != null">
-                oks_mei,
-            </if>
-            <if test="oksMeiKn != null">
-                oks_mei_kn,
-            </if>
-            <if test="tenwabango != null">
-                tenwabango,
-            </if>
-            <if test="mailAddress != null">
-                mail_address,
-            </if>
-            <if test="todoFuken != null">
-                todo_fuken,
-            </if>
-            <if test="shikuChoson != null">
-                shiku_choson,
-            </if>
-            <if test="banchiIka != null">
-                banchi_ika,
-            </if>
-            <if test="yubenbango != null">
-                yubenbango,
-            </if>
-            <if test="nokaCd != null">
-                noka_cd,
-            </if>
-            <if test="haisiFlg != null">
-                haisi_flg,
-            </if>
-            <if test="haisiDt != null">
-                haisi_dt,
-            </if>
-            <if test="haisiRiyu != null">
-                haisi_riyu,
-            </if>
-            <if test="version != null">
-                version,
-            </if>
-            <if test="createBy != null">
-                create_by,
-            </if>
-            <if test="createTime != null">
-                create_time,
-            </if>
-            <if test="createPgId != null">
-                create_pg_id,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="oksCd != null">
-                #{oksCd},
-            </if>
-            <if test="oksMei != null">
-                #{oksMei},
-            </if>
-            <if test="oksMeiKn != null">
-                #{oksMeiKn},
-            </if>
-            <if test="tenwabango != null">
-                #{tenwabango},
-            </if>
-            <if test="mailAddress != null">
-                #{mailAddress},
-            </if>
-            <if test="todoFuken != null">
-                #{todoFuken},
-            </if>
-            <if test="shikuChoson != null">
-                #{shikuChoson},
-            </if>
-            <if test="banchiIka != null">
-                #{banchiIka},
-            </if>
-            <if test="yubenbango != null">
-                #{yubenbango},
-            </if>
-            <if test="nokaCd != null">
-                #{nokaCd},
-            </if>
-            <if test="haisiFlg != null">
-                #{haisiFlg},
-            </if>
-            <if test="haisiDt != null">
-                #{haisiDt},
-            </if>
-            <if test="haisiRiyu != null">
-                #{haisiRiyu},
-            </if>
-            <if test="version != null">
-                #{version},
-            </if>
-            <if test="createBy != null">
-                #{createBy},
-            </if>
-            <if test="createTime != null">
-                #{createTime},
-            </if>
-            <if test="createPgId != null">
-                #{createPgId},
-            </if>
-        </trim>
-    </insert>
-
-    <!-- 修正6：更新语句表名改为mast_oks -->
-    <update id="update" parameterType="MastOks">
-        update mast_okyakusama
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="oksCd != null">
-                oks_cd = #{oksCd},
-            </if>
-            <if test="oksMei != null">
-                oks_mei = #{oksMei},
-            </if>
-            <if test="oksMeiKn != null">
-                oks_mei_kn = #{oksMeiKn},
-            </if>
-            <if test="tenwabango != null">
-                tenwabango = #{tenwabango},
-            </if>
-            <if test="mailAddress != null">
-                mail_address = #{mailAddress},
-            </if>
-            <if test="todoFuken != null">
-                todo_fuken = #{todoFuken},
-            </if>
-            <if test="shikuChoson != null">
-                shiku_choson = #{shikuChoson},
-            </if>
-            <if test="banchiIka != null">
-                banchi_ika = #{banchiIka},
-            </if>
-            <if test="yubenbango != null">
-                yubenbango = #{yubenbango},
-            </if>
-            <if test="nokaCd != null">
-                noka_cd = #{nokaCd},
-            </if>
-            <if test="haisiFlg != null">
-                haisi_flg = #{haisiFlg},
-            </if>
-            <if test="haisiDt != null">
-                haisi_dt = #{haisiDt},
-            </if>
-            <if test="haisiRiyu != null">
-                haisi_riyu = #{haisiRiyu},
-            </if>
-            <if test="version != null">
-                version = #{version} + 1,
-            </if>
-            <if test="updateBy != null">
-                update_by = #{updateBy},
-            </if>
-            <if test="updateTime != null">
-                update_time = #{updateTime},
-            </if>
-            <if test="updatePgId != null">
-                update_pg_id = #{updatePgId},
-            </if>
-        </trim>
-        where
-        oks_cd = #{oksCd}
-        and version = #{version}
-    </update>
-
-    <select id="getOksCdCount" parameterType="String" resultType="java.lang.Integer">
-        SELECT
-        count(1)
-        FROM
-        mast_okyakusama
-        <where>
-            <if test="oksCd != null  and oksCd != ''">
-                and oks_cd = #{oksCd}
-            </if>
-        </where>
-    </select>
-
-    <delete id="deleteById" parameterType="String">
-        delete
-        from
-        mast_okyakusama
-        where oks_cd = #{oksCd}
-    </delete>
-
-    <update id="deleteLogicByIdAndVersion" parameterType="MastOks">
-        update
-        mast_okyakusama
-        set
-        haisi_flg = 1,
-        version = version + 1,
-        <if test="updateBy != null">
-            update_by = #{updateBy},
-        </if>
-        <if test="updateTime != null">
-            update_time = #{updateTime}
-        </if>
-        <where>
-            <if test="oksCd != null  and oksCd != ''">
-                and oks_cd = #{oksCd}
-            </if>
-            and version = #{version}
-            and haisi_flg = 0
-        </where>
-    </update>
-</mapper>

farm-crm/pom.xml

@@ -42,18 +42,19 @@
             <groupId>jp.yamoto</groupId>
             <artifactId>farm-crm-biz</artifactId>
         </dependency>
-
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.5.15</version>
-                <configuration>
-                    <fork>true</fork>
-                </configuration>
                 <executions>
                     <execution>
                         <goals>
@@ -62,17 +63,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>   
-                <groupId>org.apache.maven.plugins</groupId>   
-                <artifactId>maven-war-plugin</artifactId>   
-                <version>3.1.0</version>   
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>${project.artifactId}</warName>
-                </configuration>   
-           </plugin>   
         </plugins>
-        <finalName>${project.artifactId}</finalName>
     </build>
 
 </project>

farm-crm/src/main/java/jp/yamoto/farm/crm/web/controller/common/CommonController.java

@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import jp.yamoto.farm.common.biz.domain.bo.OptionsParamBo;
+import jp.yamoto.farm.common.biz.service.IFarmCommonService;
 import jp.yamoto.farm.common.config.AppConfig;
 import jp.yamoto.farm.common.config.ServerConfig;
 import jp.yamoto.farm.common.constant.Constants;
@@ -15,10 +17,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -37,6 +36,19 @@ public class CommonController
 
     private static final String FILE_DELIMETER = ",";
 
+    @Autowired
+    private IFarmCommonService commonService;
+
+    /**
+     * コンボボックスデータを取得する
+     * @param optionsParam
+     * @return
+     */
+    @PostMapping(value = "/options")
+    public AjaxResult getCommonOptions(@RequestBody OptionsParamBo optionsParam) {
+        return AjaxResult.success(commonService.getCommonOptions(optionsParam));
+    }
+
     /**
      * 汎用ダウンロードリクエスト
      * 

farm-crm/src/main/java/jp/yamoto/farm/crm/web/controller/monitor/CacheController.java

@@ -12,7 +12,7 @@ import java.util.TreeSet;
 import jp.yamoto.farm.common.constant.CacheConstants;
 import jp.yamoto.farm.common.core.domain.AjaxResult;
 import jp.yamoto.farm.common.utils.StringUtils;
-import jp.yamoto.farm.crm.biz.sys.domain.SysCache;
+import jp.yamoto.farm.common.biz.domain.SysCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisTemplate;

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

@@ -8,8 +8,8 @@ import jp.yamoto.farm.common.core.domain.AjaxResult;
 import jp.yamoto.farm.common.core.page.TableDataInfo;
 import jp.yamoto.farm.common.enums.BusinessType;
 import jp.yamoto.farm.common.utils.poi.ExcelUtil;
-import jp.yamoto.farm.crm.biz.sys.domain.SysConfig;
-import jp.yamoto.farm.crm.biz.sys.service.ISysConfigService;
+import jp.yamoto.farm.common.biz.domain.entity.SysConfig;
+import jp.yamoto.farm.common.biz.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;

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

@@ -22,8 +22,8 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import jp.yamoto.farm.crm.biz.sys.service.ISysDictDataService;
-import jp.yamoto.farm.crm.biz.sys.service.ISysDictTypeService;
+import jp.yamoto.farm.common.biz.service.ISysDictDataService;
+import jp.yamoto.farm.common.biz.service.ISysDictTypeService;
 
 /**
  * データ辞書情報

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

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import jp.yamoto.farm.crm.biz.sys.service.ISysDictTypeService;
+import jp.yamoto.farm.common.biz.service.ISysDictTypeService;
 
 /**
  * データ辞書情報

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

@@ -42,7 +42,7 @@ public class SysLoginController
     private TokenService tokenService;
 
     /**
-     * ログイン方法
+     * ログイン
      * 
      * @param loginBody ログイン情報
      * @return 結果
@@ -62,7 +62,7 @@ public class SysLoginController
      *
      * @return ユーザー情報
      */
-    @GetMapping("getInfo")
+    @GetMapping("getUserInfo")
     public AjaxResult getInfo() {
         LoginUser<SysUser> loginUser = SecurityUtils.getLoginUser();
         SysUser user = loginUser.getUser();

farm-sankin-biz/pom.xml

@@ -17,10 +17,10 @@
 
     <dependencies>
 
-        <!-- Common -->
+        <!-- Common biz-->
         <dependency>
             <groupId>jp.yamoto</groupId>
-            <artifactId>farm-common</artifactId>
+            <artifactId>farm-common-biz</artifactId>
         </dependency>
 
     </dependencies>

farm-sankin-biz/src/main/java/jp/yamoto/farm/sankin/biz/constants/SankinConstants.java

@@ -0,0 +1,7 @@
+package jp.yamoto.farm.sankin.biz.constants;
+
+/**
+ * 農家支援システム 共通定数情報
+ */
+public class SankinConstants {
+}

farm-sankin/pom.xml

@@ -46,14 +46,17 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.5.15</version>
-                <configuration>
-                    <fork>true</fork>
-                </configuration>
                 <executions>
                     <execution>
                         <goals>
@@ -62,17 +65,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>   
-                <groupId>org.apache.maven.plugins</groupId>   
-                <artifactId>maven-war-plugin</artifactId>   
-                <version>3.1.0</version>   
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>${project.artifactId}</warName>
-                </configuration>   
-           </plugin>   
         </plugins>
-        <finalName>${project.artifactId}</finalName>
     </build>
 
 </project>

pom.xml

@@ -181,6 +181,13 @@
                 <version>${farm.version}</version>
             </dependency>
 
+            <!-- Common biz-->
+            <dependency>
+                <groupId>jp.yamoto</groupId>
+                <artifactId>farm-common-biz</artifactId>
+                <version>${farm.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -191,6 +198,7 @@
         <module>farm-sankin-biz</module>
         <module>farm-common</module>
         <module>farm-quartz</module>
+        <module>farm-common-biz</module>
     </modules>
     <packaging>pom</packaging>