From 6a6d287641a28ad19dfa1c319fe7a9191ef9ad52 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 28 六月 2024 11:16:18 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SePaymentMethodMapper.java | 10 -
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java | 20 +++
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java | 43 ++++---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoActiveCard.java | 8 +
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml | 8
pipIrr-platform/pipIrr-parent.iml | 12 ++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java | 6
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SePaymentMethodMapper.xml | 24 ++-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoDictItem.java | 8 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SePaymentMethod.java | 89 +++++++-------
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/result/SellResultCode.java | 1
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java | 4
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDictItemMapper.xml | 4
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/PipIrrBaseApplication.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java | 94 +++++++++++++++
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/SeClientToVoClient.java | 2
pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml | 13 ++
19 files changed, 257 insertions(+), 95 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SePaymentMethodMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SePaymentMethodMapper.java
index 500ec43..f5b79e6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SePaymentMethodMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SePaymentMethodMapper.java
@@ -2,18 +2,15 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSe.SePaymentMethod;
-import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
- * @author ZhuBaoMin
- * @date 2023/12/5 16:03
- * @LastEditTime 2023/12/5 16:03
+ * @author :WuZeYu
+ * @Date :2024/6/27 15:00
+ * @LastEditTime :2024/6/27 15:00
* @Description
*/
-
-@Mapper
public interface SePaymentMethodMapper extends BaseMapper<SePaymentMethod> {
int deleteByPrimaryKey(Long id);
@@ -29,6 +26,7 @@
/**
* 鑾峰彇鍏ㄩ儴鏈垹闄や粯娆炬柟寮�
+ *
* @return 鏈垹闄や粯娆炬柟寮�
*/
List<SePaymentMethod> getPaymentMethods();
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SePaymentMethod.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SePaymentMethod.java
index efda2e4..5cc3839 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SePaymentMethod.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SePaymentMethod.java
@@ -1,63 +1,62 @@
package com.dy.pipIrrGlobal.pojoSe;
/**
- * @author ZhuBaoMin
- * @date 2023/12/5 16:03
- * @LastEditTime 2023/12/5 16:03
+ * @author :WuZeYu
+ * @Date :2024/6/27 15:00
+ * @LastEditTime :2024/6/27 15:00
* @Description
*/
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import lombok.*;
-import org.hibernate.validator.constraints.Length;
-
-/**
- * 浠樻鏂瑰紡琛�
- */
-
-@TableName(value="se_payment_method", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "浠樻鏂瑰紡瀹炰綋")
-public class SePaymentMethod implements BaseEntity {
+public class SePaymentMethod {
public static final long serialVersionUID = 202401151518006L;
-
/**
- * 涓婚敭
- */
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ * 涓婚敭
+ */
private Long id;
/**
- * 浠樻鏂瑰紡
- */
- @Schema(description = "浠樻鏂瑰紡鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotEmpty(message = "浠樻鏂瑰紡鍚嶇О涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Length(message = "浠樻鏂瑰紡鍚嶇О鍚嶇О涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 10)
+ * 鍚嶇О
+ */
private String name;
/**
- * 澶囨敞淇℃伅
- */
- @Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Length(message = "澶囨敞闀垮害灏忎簬{max}瀛�", min = 1, max = 200)
+ * 澶囨敞淇℃伅
+ */
private String remarks;
/**
- * 閫昏緫鍒犻櫎鏍囪瘑;0-鏈垹闄わ紝1-鍒犻櫎
- */
- @Schema(description = "浠樻鏂瑰紡鍒犻櫎鏍囧織锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ * 閫昏緫鍒犻櫎鏍囪瘑;0-鏈垹闄わ紝1-鍒犻櫎
+ */
private Byte deleted;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ public Byte getDeleted() {
+ return deleted;
+ }
+
+ public void setDeleted(Byte deleted) {
+ this.deleted = deleted;
+ }
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoDictItem.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoDictItem.java
index cf95647..530e9be 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoDictItem.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoDictItem.java
@@ -1,5 +1,7 @@
package com.dy.pipIrrGlobal.voBa;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.po.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -17,6 +19,12 @@
private static final long serialVersionUID = 202406262059001L;
/**
+ * 瀛楀吀椤笽D
+ */
+ @JSONField(serializeUsing = ObjectWriterImplToString.class)
+ private Long dictItemId;
+
+ /**
* 鏍囩
*/
private String name;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java
index e895f37..becefee 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java
@@ -39,9 +39,9 @@
private String villageName;
@Schema(title = "鐗囧尯ID")
- private String blockid;
+ private String blockId;
@Schema(title = "鐗囧尯鍚嶇О")
- private String bolckName;
+ private String blockName;
@Schema(title = "鍒嗘按鎴縄D")
private String divideId;
@@ -66,7 +66,7 @@
private String phone;
@Schema(title = "韬唤璇佸彿")
- private String idcard;
+ private String idCard;
@Schema(title = "绉嶆闈㈢Н")
private Double area;
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index 96dd783..edd5c60 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -72,7 +72,7 @@
pipIrr:
global:
- dev: true #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
+ dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
mw:
webPort: 8070
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
index 0cc170c..c427921 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
@@ -11,6 +11,19 @@
</province>
</districts>
<user name="瓒呯骇绠＄悊鍛�" phone="admin" password="admin" supperAdmin="1" />
+ <payments>
+ <item1 name="鐜伴噾"/>
+ <item2 name="寰俊鏀粯"/>
+ <item3 name="鏀粯瀹濇敮浠�"/>
+ <item4 name="閾惰杞处"/>
+ </payments>
+ <settings>
+ <item1 item_name="lng" item_value="101.87345" remarks="缁忓害"/>
+ <item2 item_name="lat" item_value="25.70424" remarks="绾害"/>
+ <item3 item_name="projectNo" item_value="10" remarks="椤圭洰缂栧彿"/>
+ <item4 item_name="controllerType" item_value="57" remarks="鎺у埗鍣ㄧ被鍨�"/>
+ <item5 item_name="protocolName" item_value="p206V202404" remarks="鍗忚鍚嶇О"/>
+ </settings>
</org1>
</orgs>
</config>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDictItemMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDictItemMapper.xml
index 626c080..957e209 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDictItemMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDictItemMapper.xml
@@ -192,7 +192,9 @@
<!--鏍规嵁瀛楀吀Code鑾峰彇瀛楀吀椤�-->
<select id="getDictItemsByDictCode" resultType="com.dy.pipIrrGlobal.voBa.VoDictItem">
SELECT
- name, value
+ id AS dictItemId,
+ name,
+ value
FROM ba_dict_item
WHERE deleted = 0 AND status = 1 AND dict_code = #{dictCode}
ORDER BY sort
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
index 674f25f..8236c83 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
@@ -286,7 +286,7 @@
address = #{address,jdbcType=VARCHAR},
remarks = #{remarks,jdbcType=VARCHAR},
`operator` = #{operator,jdbcType=BIGINT},
- operateDt = #{operatedt,jdbcType=TIMESTAMP},
+ operateDt = #{operatedt,jdbcType=TIMESTAMP}
<!-- disabled = #{disabled,jdbcType=TINYINT},-->
<!-- deleted = #{deleted,jdbcType=TINYINT}-->
where id = #{id,jdbcType=BIGINT}
@@ -341,7 +341,7 @@
CAST(cli.villageId AS char) AS villageId,
dis_village.name AS villageName,
CAST(cli.blockId AS char) AS blockId,
- blo.name AS bolckName,
+ blo.name AS blockName,
CAST(cli.divideId AS char) AS divideId,
divi.name AS divideName,
CAST(cli.typeId AS char) AS waterTypeId,
@@ -393,7 +393,7 @@
<!--鏍规嵁鍐滄埛缂栧彿鑾峰彇5绾ц鏀垮尯鍒掍唬鐮�-->
<select id="getAreaCodeByNum" resultType="java.lang.Long">
- SELECT districtNum FROM se_client WHERE clientNum = ${clientNum}
+ SELECT districtNum FROM se_client WHERE clientNum = ${clientNum} LIMIT 0,1
</select>
<!--鏍规嵁鍐滄埛缂栧彿鑾峰彇5绾ц鏀垮尯鍒掍覆areaCode锛岃ˉ鍗¤繃绋嬩腑寮�鏂板崱浣跨敤-->
@@ -403,7 +403,7 @@
<!--鏍规嵁鍐滄埛缂栧彿鑾峰彇鍐滄埛ID-->
<select id="getClientIdByNum" resultType="java.lang.Long">
- SELECT id FROM se_client WHERE clientNum = ${clientNum}
+ SELECT id FROM se_client WHERE clientNum = ${clientNum} LIMIT 0,1
</select>
<!--鏍规嵁鐢佃瘽鍙风爜鑾峰彇鍐滄埛ID-->
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SePaymentMethodMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SePaymentMethodMapper.xml
index f6a0859..ffae3bb 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SePaymentMethodMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SePaymentMethodMapper.xml
@@ -20,28 +20,25 @@
from se_payment_method
where id = #{id,jdbcType=BIGINT}
</select>
-
- <!--鑾峰彇鍏ㄩ儴鏈垹闄や粯娆炬柟寮�-->
- <select id="getPaymentMethods" resultType="com.dy.pipIrrGlobal.pojoSe.SePaymentMethod">
- SELECT * FROM se_payment_method WHERE deleted = 0
- </select>
-
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
delete from se_payment_method
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SePaymentMethod" useGeneratedKeys="true">
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoSe.SePaymentMethod" >
<!--@mbg.generated-->
- insert into se_payment_method (`name`, remarks, deleted
+ insert into se_payment_method (id, `name`, remarks, deleted
)
- values (#{name,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, #{deleted,jdbcType=TINYINT}
+ values (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, #{deleted,jdbcType=TINYINT}
)
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SePaymentMethod" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into se_payment_method
<trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
<if test="name != null">
`name`,
</if>
@@ -53,6 +50,9 @@
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ #{id,jdbcType=BIGINT},
+ </if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
@@ -88,4 +88,10 @@
deleted = #{deleted,jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT}
</update>
+
+
+ <!--鑾峰彇鍏ㄩ儴鏈垹闄や粯娆炬柟寮�-->
+ <select id="getPaymentMethods" resultType="com.dy.pipIrrGlobal.pojoSe.SePaymentMethod">
+ SELECT * FROM se_payment_method WHERE deleted = 0
+ </select>
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-parent.iml b/pipIrr-platform/pipIrr-parent.iml
new file mode 100644
index 0000000..4ae5c36
--- /dev/null
+++ b/pipIrr-platform/pipIrr-parent.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_16">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/PipIrrBaseApplication.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/PipIrrBaseApplication.java
index 1089355..32edd0d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/PipIrrBaseApplication.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/PipIrrBaseApplication.java
@@ -18,7 +18,7 @@
})
}
)
-@MapperScan(basePackages={"com.dy.pipIrrGlobal.daoBa"})
+@MapperScan(basePackages={"com.dy.pipIrrGlobal.daoBa","com.dy.pipIrrGlobal.daoSe"})
public class PipIrrBaseApplication {
public static void main(String[] args) {
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java
index f3fd0d7..9779e1b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java
@@ -7,9 +7,13 @@
import com.dy.common.util.MD5;
import com.dy.common.webListener.ConfigListener;
import com.dy.pipIrrGlobal.daoBa.BaDistrictMapper;
+import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper;
import com.dy.pipIrrGlobal.daoBa.BaUserMapper;
+import com.dy.pipIrrGlobal.daoSe.SePaymentMethodMapper;
import com.dy.pipIrrGlobal.pojoBa.BaDistrict;
+import com.dy.pipIrrGlobal.pojoBa.BaSettings;
import com.dy.pipIrrGlobal.pojoBa.BaUser;
+import com.dy.pipIrrGlobal.pojoSe.SePaymentMethod;
import com.dy.pipIrrGlobal.util.DistrictLevel;
import org.jdom2.Document;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +35,8 @@
private BaDistrictMapper distriDao ;
private BaUserMapper userDao ;
+ private SePaymentMethodMapper paymentMethodDao ;
+ private BaSettingsMapper settingsDao ;
@Autowired
public void setDistriDao(BaDistrictMapper distriDao){
@@ -40,6 +46,16 @@
@Autowired
public void setUserDao(BaUserMapper userDao){
this.userDao = userDao ;
+ }
+
+ @Autowired
+ public void setPaymentDao(SePaymentMethodMapper paymentMethodDao){
+ this.paymentMethodDao = paymentMethodDao ;
+ }
+
+ @Autowired
+ public void setSettingsDao(BaSettingsMapper settingsDao){
+ this.settingsDao = settingsDao ;
}
@@ -111,6 +127,32 @@
this.saveUser(orgTag, name, phone, password, supperAdmin);
}
}
+ if(!this.existPayments()){
+ if(configXml.existElement(doc, "config.orgs.org" + num + ".payments")){
+ for(int i = 1 ; i < 10000; i++){
+ if(configXml.existElement(doc, "config.orgs.org" + num + ".payments.item" + i)){
+ String name = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".payments.item" + i,"name", null, false, null) ;
+ this.savePayment(orgTag, name);
+ }else{
+ break ;
+ }
+ }
+ }
+ }
+ if(!this.existSettings()){
+ if(configXml.existElement(doc, "config.orgs.org" + num + ".settings")){
+ for(int i = 1 ; i < 10000; i++){
+ if(configXml.existElement(doc, "config.orgs.org" + num + ".settings.item" + i)){
+ String item_name = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".settings.item" + i,"item_name", null, false, null) ;
+ String item_value = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".settings.item" + i,"item_value", null, false, null) ;
+ String remarks = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".settings.item" + i,"remarks", null, false, null) ;
+ this.saveSettings(orgTag, item_name, item_value, remarks);
+ }else{
+ break ;
+ }
+ }
+ }
+ }
}else{
break ;
}
@@ -128,11 +170,29 @@
}
/**
- * 鏁版嵁搴撲腑鏄惁瀛樺湪琛屾斂鍖哄垝鏁版嵁
+ * 鏁版嵁搴撲腑鏄惁瀛樺湪鐢ㄦ埛鏁版嵁
* @return 瀛樺湪鍚�
*/
private boolean existUsers(){
Long total = this.userDao.selectCount(null) ;
+ return (total != null && total > 0) ;
+ }
+
+ /**
+ * 鏁版嵁搴撲腑鏄惁瀛樺湪鏀粯鏂瑰紡鏁版嵁
+ * @return 瀛樺湪鍚�
+ */
+ private boolean existPayments(){
+ Long total = this.paymentMethodDao.selectCount(null) ;
+ return (total != null && total > 0) ;
+ }
+
+ /**
+ * 鏁版嵁搴撲腑鏄惁瀛樺湪绯荤粺閰嶇疆鏁版嵁
+ * @return 瀛樺湪鍚�
+ */
+ private boolean existSettings(){
+ Long total = this.settingsDao.selectCount(null) ;
return (total != null && total > 0) ;
}
@@ -185,5 +245,37 @@
this.userDao.putin(po) ;
}
}
+ /**
+ * 淇濆瓨鏀粯鏂瑰紡
+ * @param orgTag 鏈烘瀯鏍囩
+ * @param name 鍚嶇О
+ */
+ private void savePayment(String orgTag, String name) throws Exception{
+ if(name != null && !name.trim().equals("")){
+ SePaymentMethod po = new SePaymentMethod() ;
+ po.setName(name);
+ po.setDeleted(Deleted.NO.code);
+ this.paymentMethodDao.insert(po) ;
+ }
+ }
+
+ /**
+ * 淇濆瓨绯荤粺閰嶇疆
+ * @param item_name 閰嶇疆椤�
+ * @param item_value 閰嶇疆椤瑰��
+ * @param remarks 澶囨敞淇℃伅
+ * @throws Exception
+ */
+ private void saveSettings(String orgTag,String item_name, String item_value,String remarks) throws Exception{
+ if((item_name != null && !item_name.trim().equals("")) &&
+ (item_value != null && !item_value.trim().equals("")) &&
+ (remarks != null && !remarks.trim().equals(""))){
+ BaSettings po = new BaSettings() ;
+ po.setItemName(item_name);
+ po.setItemValue(item_value);
+ po.setRemarks(remarks);
+ this.settingsDao.insert(po) ;
+ }
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
index e21fdae..a6bbf1c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
@@ -132,13 +132,13 @@
}
/**
- * 鏍规嵁鎺у埗鍣ㄧ紪鍙烽�昏緫鍒犻櫎鎺у埗
+ * 鏍规嵁鎺у埗鍣ㄧ紪鍙风墿鐞嗗垹闄ゆ帶鍒�
*
* @param controllerId
* @return
*/
public Integer deleteControllerById(Long controllerId) {
- return prControllerMapper.deleteControllerById(controllerId);
+ return prControllerMapper.deleteByPrimaryKey(controllerId);
}
/**
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
index b490bcb..bb54a18 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
@@ -59,15 +59,6 @@
* @param bindingResult
* @return 姘村崱缂栧彿
*/
- @Operation(summary = "寮�鍗�", description = "鏂板紑鍐滄埛鍗�")
- @ApiResponses(value = {
- @ApiResponse(
- responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
- description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
- content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
- schema = @Schema(implementation = Boolean.class))}
- )
- })
@PostMapping(path = "active", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
@@ -77,7 +68,15 @@
}
// 鑾峰彇5绾ц鏀垮尯鍒掍覆areaCode
- String areaCode = String.valueOf(cardOperateSv.getAreaCodeByNum(po.getClientNum()));
+ String areaCode = cardOperateSv.getAreaCodeByNum(po.getClientNum());
+ if(areaCode.trim().length() == 0) {
+ return BaseResponseUtils.buildErrorMsg(SellResultCode.AREA_CODE_MISTAKE.getMessage());
+ }
+
+ // p206V1_0_1鍗忚锛屽皢鍓�6浣嶈鏀垮尯鍒掓敼涓�100000
+ if(po.getProtocol().trim().equals("p206V1_0_1")) {
+ areaCode = "100000" + areaCode.substring(6);
+ }
/**
* 鏍规嵁琛屾斂鍖哄垝涓诧紙areaCode锛夊湪姘村崱琛ㄤ腑閽堝姘村崱缂栧彿锛坈ardNum锛夎繘琛屾ā绯婃煡璇�
@@ -89,12 +88,12 @@
if(cardNum != null && cardNum.trim().length() > 0) {
Integer number = Integer.parseInt(cardNum.substring(12));
number = number + 1;
- if(number > 9999) {
- return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_OVERRUN.getMessage());
+ if(number > 65535) {
+ return BaseResponseUtils.buildErrorMsg(SellResultCode.CARD_NUMBER_OVERRUN.getMessage());
}
- cardNum = cardNum.substring(0, 12) + String.format("%04d", number);
+ cardNum = cardNum.substring(0, 12) + String.format("%05d", number);
} else {
- cardNum = areaCode + "0001";
+ cardNum = areaCode + "00001";
}
/**
@@ -122,6 +121,9 @@
* 鏍规嵁鍐滄埛缂栧彿鑾峰彇鍐滄埛ID
*/
Long clientId = cardOperateSv.getClientIdByNum(clientNum);
+ if(clientId == null) {
+ return BaseResponseUtils.buildErrorMsg(SellResultCode.CLIENT_NUM_ERROR.getMessage());
+ }
/**
* 娣诲姞鍐滄埛鍗¤褰曪紝閫�杩橀噾棰濅綔涓哄綋鍓嶄綑棰�
@@ -137,7 +139,7 @@
seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
Long cardId = Optional.ofNullable(clientCardSv.add(seClientCard)).orElse(0L) ;
if(cardId == 0) {
- return BaseResponseUtils.buildFail(SellResultCode.ACTIVE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
+ return BaseResponseUtils.buildErrorMsg(SellResultCode.ACTIVE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
}
/**
@@ -155,7 +157,7 @@
seCardOperate.setOperateDt(activeTime);
Long rec = Optional.ofNullable(cardOperateSv.add(seCardOperate)).orElse(0L);
if(rec == 0) {
- return BaseResponseUtils.buildFail(SellResultCode.ACTIVE_FAIL_WRITE_ACTIVE_CARD_ERROR.getMessage());
+ return BaseResponseUtils.buildErrorMsg(SellResultCode.ACTIVE_FAIL_WRITE_ACTIVE_CARD_ERROR.getMessage());
}
/**
@@ -171,12 +173,17 @@
dtoRecharge.setPrice(0f);
BaseResponse<Boolean> job = cardOperateSv.addRecharge(dtoRecharge);
if(!job.getCode().equals("0001")) {
- return BaseResponseUtils.buildFail(SellResultCode.ACTIVE_FAIL_RECHARGE_EXCEPTION.getMessage());
+ return BaseResponseUtils.buildErrorMsg(SellResultCode.ACTIVE_FAIL_RECHARGE_EXCEPTION.getMessage());
}
}
+ if(po.getProtocol().trim().equals("p206V1_0_1")) {
+ cardNum = cardNum.substring(6,12) + cardNum.substring(13);
+ }
+
Map map = new HashMap();
- map.put("projectCode", Constant.projectCode_ym);
+ map.put("projectNo", String.format("%02x", Integer.parseInt(cardOperateSv.getProjectNo())));
+ map.put("orderNumber", cardId);
map.put("cardNum", cardNum);
return BaseResponseUtils.buildSuccess(map) ;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
index 97ddce7..d9f02e0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
@@ -6,6 +6,7 @@
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper;
import com.dy.pipIrrGlobal.daoSe.SeCardOperateMapper;
import com.dy.pipIrrGlobal.daoSe.SeClientCardMapper;
import com.dy.pipIrrGlobal.daoSe.SeClientMapper;
@@ -52,6 +53,9 @@
@Autowired
private SeGeneralMapper seGeneralMapper;
+ @Autowired
+ private BaSettingsMapper baSettingsMapper;
+
/**
* 娣诲姞寮�鍗¤褰�
@@ -68,8 +72,12 @@
* @param clientNum 鍐滄埛缂栧彿
* @return 5绾ц鏀垮尯鍒掍唬鐮�
*/
- public Long getAreaCodeByNum(String clientNum) {
- return seClientMapper.getAreaCodeByNum(clientNum);
+ public String getAreaCodeByNum(String clientNum) {
+ Long areaCode = seClientMapper.getAreaCodeByNum(clientNum);
+ if (areaCode == null) {
+ return "";
+ }
+ return String.valueOf(areaCode);
}
/**
@@ -437,4 +445,12 @@
public Integer updateClientCard(SeClientCard po) {
return seClientCardMapper.updateByPrimaryKeySelective(po);
}
+
+ /**
+ * 鑾峰彇椤圭洰缂栧彿
+ * @return
+ */
+ public String getProjectNo() {
+ return baSettingsMapper.getItemValue("projectNo");
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoActiveCard.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoActiveCard.java
index 63477f2..0a5e3a5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoActiveCard.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoActiveCard.java
@@ -21,6 +21,13 @@
@Schema(name = "寮�鍗′紶鍏ュ璞�")
public class DtoActiveCard {
public static final long serialVersionUID = 202401181945001L;
+
+ /**
+ * 鍗忚鍚嶇О
+ */
+ @NotBlank(message = "鎮ㄥ繀椤婚�夋嫨涓�涓崗璁�")
+ private String protocol;
+
/**
* 姘村崱鍦板潃锛屼粎淇濆瓨锛屾棤涓氬姟
*/
@@ -32,6 +39,7 @@
* 鍐滄埛缂栧彿锛屽紑鍗′娇鐢�
*/
@Schema(description = "鍐滄埛缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotBlank(message = "鍐滄埛缂栧彿涓嶈兘涓虹┖")
private String clientNum;
/**
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java
index f0abe8f..38061cc 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java
@@ -140,7 +140,7 @@
String villageName = map_districts.get("villageName").toString();
// 鐢熸垚8浣嶈鏀垮尯鍒掔紪鐮侊紝鐢熸垚鍐滄埛缂栧彿鐢�
- String district8 = countyNum + townNum + villageNum;
+ String district8 = String.format("%02d", Integer.parseInt(countyNum)) + String.format("%03d", Integer.parseInt(townNum)) + String.format("%03d", Integer.parseInt(villageNum));
// 鐢熸垚鍐滄埛缂栧彿
String clientNum = generateClientNum(district8);
// 鐢熸垚12浣�5绾ц鏀垮尯鍒掔紪鐮佷覆鍙婂悕绉颁覆
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/SeClientToVoClient.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/SeClientToVoClient.java
index f5452f0..dfd265e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/SeClientToVoClient.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/SeClientToVoClient.java
@@ -20,7 +20,7 @@
@Mapping(target = "name", source = "name")
@Mapping(target = "clientNum", source = "clientnum")
@Mapping(target = "phone", source = "phone")
- @Mapping(target = "idcard", source = "idcard")
+ @Mapping(target = "idCard", source = "idcard")
//@Mapping(target = "cardCount", source = "cardCount")
@Mapping(target = "address", source = "address")
@Mapping(target = "operateDt", source = "operatedt")
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/result/SellResultCode.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/result/SellResultCode.java
index cbd7e67..c5eaca0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/result/SellResultCode.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/result/SellResultCode.java
@@ -17,6 +17,7 @@
* 寮�鍗�/琛ュ崱
*/
AREA_CODE_MISTAKE(10001, "璇ュ啘鎴疯鏀垮尯鍒掑紓甯�"),
+ CLIENT_NUM_ERROR(10001, "鍐滄埛缂栧彿閿欒"),
CARD_NUMBER_OVERRUN(10002, "姘村崱缂栧彿宸叉弧"),
ACTIVE_FAIL_WRITE_CLIENT_CARD_ERROR(10003, "寮�鍗″け璐�-鍐滄埛鍗″啓鍏ュ紓甯�"),
ACTIVE_FAIL_WRITE_ACTIVE_CARD_ERROR(10004, "寮�鍗″け璐�-寮�鍗¤褰曞啓鍏ュ紓甯�"),
--
Gitblit v1.8.0