代码提交

.gitignore

@@ -1,38 +1,38 @@
 .idea/
 *.iml
-/ssjygl-xsx-common/target/
-/ssjygl-xsx-local/target/
-/ssjygl-xsx-service/target/
-/ssjygl-xsx-devicectrl/target/
+/ssjygl-xsct-common/target/
+/ssjygl-xsct-local/target/
+/ssjygl-xsct-service/target/
+/ssjygl-xsct-devicectrl/target/
 
 /logs/
-/ssjygl-xsx-common/logs/
-/ssjygl-xsx-local/logs/
-/ssjygl-xsx-service/logs/
-/ssjygl-xsx-devicectrl/logs/
+/ssjygl-xsct-common/logs/
+/ssjygl-xsct-local/logs/
+/ssjygl-xsct-service/logs/
+/ssjygl-xsct-devicectrl/logs/
 
-/ssjygl-xsx-common/out/
-/ssjygl-xsx-local/out/
-/ssjygl-xsx-service/out/
-/ssjygl-xsx-devicectrl/out/
+/ssjygl-xsct-common/out/
+/ssjygl-xsct-local/out/
+/ssjygl-xsct-service/out/
+/ssjygl-xsct-devicectrl/out/
 
-/ssjygl-xsx-common/upload/
-/ssjygl-xsx-local/upload/
-/ssjygl-xsx-service/upload/
-/ssjygl-xsx-devicectrl/upload/
+/ssjygl-xsct-common/upload/
+/ssjygl-xsct-local/upload/
+/ssjygl-xsct-service/upload/
+/ssjygl-xsct-devicectrl/upload/
 
-/ssjygl-xsx-common/.idea/
-/ssjygl-xsx-local/.idea/
-/ssjygl-xsx-service/.idea/
-/ssjygl-xsx-devicectrl/.idea/
+/ssjygl-xsct-common/.idea/
+/ssjygl-xsct-local/.idea/
+/ssjygl-xsct-service/.idea/
+/ssjygl-xsct-devicectrl/.idea/
 
 /gern
-/ssjygl-xsx-common/imgfile/
-/ssjygl-xsx-local/imgfile/
-/ssjygl-xsx-common/xlsfile/
-/ssjygl-xsx-local/xlsfile/
-/ssjygl-xsx-common/KHT_Log/
-/ssjygl-xsx-local/KHT_Log/
+/ssjygl-xsct-common/imgfile/
+/ssjygl-xsct-local/imgfile/
+/ssjygl-xsct-common/xlsfile/
+/ssjygl-xsct-local/xlsfile/
+/ssjygl-xsct-common/KHT_Log/
+/ssjygl-xsct-local/KHT_Log/
 
-/ssjygl-xsx-local/lib/bocommjava/log
-/ssjygl-xsx-local/src/main/webapp/upload
+/ssjygl-xsct-local/lib/bocommjava/log
+/ssjygl-xsct-local/src/main/webapp/upload

README.md

@@ -1,7 +1,7 @@
 #砂石经营管理2.0
-##浠水县后端服务
+##浠水城投后端服务
 1. ssjygl-xs-common 本地和云端后端服务公用代码
 2. ssjygl-xs-local 本地后端服务
 3. ssjygl-xs-service 云端后端服务
 
-2021年7月改版开发分支
+2021年7月改版开发分支

build.bat

@@ -1,7 +1,7 @@
-cd ../ssjygl-xsx-local
+cd ../ssjygl-xsct-local
 start mvn clean package
 
-cd ../ssjygl-xsx-service
+cd ../ssjygl-xsct-service
 start mvn clean package
 
-cd ..
+cd ..

build.sh

@@ -1,10 +1,10 @@
-cd ssjygl-xsx-common
+cd ssjygl-xsct-common
 mvn clean package install
 
-cd ../ssjygl-xsx-local
+cd ../ssjygl-xsct-local
 mvn clean package
 
-cd ../ssjygl-xsx-service
+cd ../ssjygl-xsct-service
 mvn clean package
 
-cd ..
+cd ..

ssjygl-xsct-common/pom.xml

@@ -4,12 +4,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.cowr.ssjygl-xsx-common</groupId>
-    <artifactId>ssjygl-xsx-common</artifactId>
+    <groupId>com.cowr.ssjygl-xsct-common</groupId>
+    <artifactId>ssjygl-xsct-common</artifactId>
     <version>1.0</version>
     <packaging>jar</packaging>
 
-    <name>砂石经营管理-浠水县-公用代码</name>
+    <name>砂石经营管理-浠水城投-公用代码</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
-            <version>1.1.22</version>
+            <version>1.1.20</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -146,4 +146,4 @@
 
     </dependencies>
 
-</project>
+</project>

ssjygl-xsct-common/src/main/java/com/cowr/common/Const.java

@@ -30,6 +30,7 @@ public class Const {
     public static final String              TEMP_CODE_SURPLUS_WARN      = "SMS_208975325"; // 客户余额预警
     public static final String              TEMP_CODE_REFUND_SUCCESS    = "SMS_208965364"; // 客户退款成功通知
     public static final String              TEMP_CODE_AGGR_DAY_STAT     = "SMS_232891438"; // 累计及日销售汇总（不含预售）
+    public static final String              TEMP_CODE_AGGR_DAY_STAT_1     = "SMS_471810248"; // 累计及日销售汇总（含处置砂）
     public static       Map<String, String> SMS_TEMP_MAP;
 
     static {
@@ -44,6 +45,7 @@ public class Const {
         SMS_TEMP_MAP.put(TEMP_CODE_SURPLUS_WARN, "截至${time}${customer_name}在${vendor}的预存账户余额为${surplus}元。请及时关注。");
         SMS_TEMP_MAP.put(TEMP_CODE_REFUND_SUCCESS, "${time}${customer_name}在${vendor}的退款${amount}元，合计余额${surplus}元。");
         SMS_TEMP_MAP.put(TEMP_CODE_AGGR_DAY_STAT, "截至${time1}累计销售黄砂${aggr_weight}吨，共计${aggr_price}元，运输${aggr_cnt}辆次。${time2}当日销售黄砂${total_weight}吨，共计${total_price}元，运输${total_cnt}辆次。");
+        SMS_TEMP_MAP.put(TEMP_CODE_AGGR_DAY_STAT_1, "截至${time1}累计销售黄砂${aggr_weight}吨，共计${aggr_price}元，运输${aggr_cnt}辆次。处置砂${aggr_weight1}吨，共计${aggr_price1}元，运输${aggr_cnt1}辆次。${time2}当日销售黄砂${total_weight}吨，共计${total_price}元，运输${total_cnt}辆次。处置砂${total_weight1}吨，共计${total_price1}元，运输${total_cnt1}辆次。");
     }
 
 

ssjygl-xsct-common/src/main/java/com/cowr/common/enums/OrderTypeEnum.java

@@ -17,8 +17,8 @@ public enum OrderTypeEnum {
     TEMP(3),
     TRASH(4),
     PURCHASE(5),
-    PRESELL(6);
-
+    PRESELL(6),
+    ALL(7);
     OrderTypeEnum(int typeid) {
         this.typeid = typeid;
     }

ssjygl-xsct-common/src/main/java/com/cowr/common/oss/OSSKit.java

@@ -1,6 +1,7 @@
 package com.cowr.common.oss;
 
 import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.model.OSSObject;
 import com.aliyun.oss.model.ObjectListing;
 import com.aliyun.oss.model.ObjectMetadata;
 import com.jfinal.kit.StrKit;
@@ -10,16 +11,16 @@ import java.io.File;
 import java.net.URLEncoder;
 
 public class OSSKit {
-    private static Log       log = Log.getLog(OSSKit.class);
+    private static Log log = Log.getLog(OSSKit.class);
     private static OSSClient _ossClient;
-    private static String    bucketName;
+    private static String bucketName;
 
     private static String endpoint;
-    private static String accessKeyId     = "LTAIqQ3TXBgNGBWi";
+    private static String accessKeyId = "LTAIqQ3TXBgNGBWi";
     private static String accessKeySecret = "CGbPXdfX4xca3uaN2cOmTzjsG4jd6O";
 
     public static void init(String endpoint, String bucketName) {
-        OSSKit.endpoint   = endpoint;
+        OSSKit.endpoint = endpoint;
         OSSKit.bucketName = bucketName;
     }
 
@@ -72,6 +73,26 @@ public class OSSKit {
         return true;
     }
 
+    public static OSSObject getFile(String key) {
+        if (_ossClient == null) {
+            log.error("没有初始化 OSSMgrClient");
+
+            OSSKit.start();
+
+            if (_ossClient == null) {
+                log.error("OSSMgrClient 初始化失败");
+                return null;
+            }
+        }
+
+        if (!StrKit.notBlank(key)) {
+            return null;
+        }
+
+        return _ossClient.getObject(bucketName, key);
+
+    }
+
     public static boolean putObject(String bucketName, String key, File file) throws Exception {
         if (_ossClient == null) {
             log.error("没有初始化 OSSMgrClient");
@@ -113,7 +134,7 @@ public class OSSKit {
         return true;
     }
 
-    public static ObjectListing list(String prefix){
+    public static ObjectListing list(String prefix) {
         if (_ossClient == null) {
             log.error("没有初始化 OSSMgrClient");
             return null;

ssjygl-xsct-common/src/main/java/com/cowr/common/utils/DataUtil.java

@@ -139,4 +139,11 @@ public class DataUtil {
 
         return obj == null ? 0.0 : obj;
     }
+
+    public static String formatWithVarargs(String format, Object... objs) {
+        if (null == objs || objs.length == 0){
+            return format;
+        }
+        return String.format(format, objs);
+    }
 }

ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerContractSigned.java

@@ -0,0 +1,14 @@
+package com.cowr.model;
+
+import com.cowr.model.base.BaseCustomerContractSigned;
+
+/**
+ * Generated by COWR Wed Nov 17 15:39:45 CST 2021
+ * TableName: customer_contract_signed_log
+ * Remarks:
+ * PrimaryKey: id
+ */
+@SuppressWarnings("serial")
+public class CustomerContractSigned extends BaseCustomerContractSigned<CustomerContractSigned> {
+    public static final CustomerContractSigned dao = new CustomerContractSigned().dao();
+}

ssjygl-xsct-common/src/main/java/com/cowr/model/HbrsmsLog.java

@@ -0,0 +1,16 @@
+package com.cowr.model;
+
+import com.cowr.model.base.BaseHbrsmsLog;
+
+/**
+ * Description:
+ * Created by XuSan on 2024/10/10.
+ *
+ * @author XuSan
+ * @version 1.0
+ */
+public class HbrsmsLog extends BaseHbrsmsLog<HbrsmsLog> {
+
+    public static final HbrsmsLog dao = new HbrsmsLog().dao();
+
+}