wangzhe 2 éve
szülő
commit
013df356a6

+ 6 - 6
test-api/src/main/java/com/sooka/api/Guiji_Gas.java

@@ -826,11 +826,11 @@ public class Guiji_Gas extends BaseApi {
      * @return 鑫科客户系统-受理信息
      */
     @POST
-    @Path("/guiji_select_gas_XinKer_gas_meter_infor")
+    @Path("/guiji_select_gas_XinKer_acceptance_infor")
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
-    public ResultModel guiji_select_gas_XinKer_gas_meter_infor(Guiji_gas15_XinKer_acceptance_infor_Bean bean) {
-        ResultModel r = guiji_gas_service.select_gas_XinKer_gas_meter_infor(bean);
+    public ResultModel guiji_select_gas_XinKer_acceptance_infor(Guiji_gas15_XinKer_acceptance_infor_Bean bean) {
+        ResultModel r = guiji_gas_service.select_gas_XinKer_acceptance_infor(bean);
         return r;
     }
 
@@ -840,11 +840,11 @@ public class Guiji_Gas extends BaseApi {
      * @return 鑫科客户系统-处理信息
      */
     @POST
-    @Path("/guiji_select_gas_XinKer_gas_purchase_infor")
+    @Path("/guiji_select_gas_XinKer_disposition_infor")
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
-    public ResultModel guiji_select_gas_XinKer_gas_purchase_infor(Guiji_gas16_XinKer_disposition_info_Bean bean) {
-        ResultModel r = guiji_gas_service.select_gas_XinKer_gas_purchase_infor(bean);
+    public ResultModel guiji_select_gas_XinKer_disposition_infor(Guiji_gas16_XinKer_disposition_info_Bean bean) {
+        ResultModel r = guiji_gas_service.select_gas_XinKer_disposition_infor(bean);
         return r;
     }
 }

+ 41 - 1
test-api/src/main/java/com/sooka/base/util/Generator.java

@@ -1,7 +1,7 @@
 package com.sooka.base.util;
 
 public class Generator {
-    public static void main(String[] args) {
+    public static void main2(String[] args) {
         String str = "userName, userPhone, userAddr, balance, userCode";
 
         String[] arr = str.split(", ");
@@ -17,4 +17,44 @@ public class Generator {
             System.out.println("bean.set" + arr[i].substring(0, 1).toUpperCase() + arr[i].substring(1, arr[i].length()) + "(Data.getString(\"" + arr[i] + "\"));");
         }
     }
+
+
+    static String str = "";
+    static String note = "";
+    static String[] arr = null;
+    static String[] notes = null;
+    static String[] properties = null;
+    public static void main(String[] args) {
+        String bean = "String ClerkOrdering;//接单人员\n" +
+                "    String DateTime;//接单时间\n" +
+                "    String Worker;//工作人员\n" +
+                "    String ResultCode;//处理结果\n" +
+                "    String Content;//具体内容";
+
+        properties = bean.split("\n");
+
+        for (int i = 0; i < properties.length; i++) {
+            String line = properties[i];
+            String property = line.split(";")[0].split("String ")[1];
+            str = str + property + ", ";
+        }
+        arr = str.split(", ");
+
+        for (int i = 0; i < properties.length; i++) {
+            String line = properties[i];
+            String annotation = line.split(";")[1].split("//")[1];//String f_username;//用户姓名/单位名称
+            note = note + annotation + ", ";
+        }
+        //debug
+        //System.out.println(note);
+        notes = note.split(", ");
+
+        for (int i = 0; i < arr.length; i++) {
+            System.out.println("      \""+arr[i]+"\":\""+notes[i]+"\",");
+//            System.out.println("/** " + notes[i] + " */");
+//            System.out.println("@Excel(name = \"" + notes[i] + "\" )");
+//            System.out.println("private String " + arr[i] + ";");
+//            System.out.println();
+        }
+    }
 }

+ 2 - 2
test-api/src/main/java/com/sooka/mapper/Guiji_Gas_Mapper2.java

@@ -64,6 +64,6 @@ public interface Guiji_Gas_Mapper2 {
     public List<Guiji_gas12_SC_gas_purchase_infor_Bean> select_gas_SC_gas_purchase_infor(Guiji_gas12_SC_gas_purchase_infor_Bean bean);
     public List<Guiji_gas13_SC_meter_reading_infor_Bean> select_gas_SC_meter_reading_infor(Guiji_gas13_SC_meter_reading_infor_Bean bean);
     public List<Guiji_gas14_XinKer_user_infor_Bean> select_gas_XinKer_user_infor(Guiji_gas14_XinKer_user_infor_Bean bean);
-    public List<Guiji_gas15_XinKer_acceptance_infor_Bean> select_gas_XinKer_gas_meter_infor(Guiji_gas15_XinKer_acceptance_infor_Bean bean);
-    public List<Guiji_gas16_XinKer_disposition_info_Bean> select_gas_XinKer_gas_purchase_infor(Guiji_gas16_XinKer_disposition_info_Bean bean);
+    public List<Guiji_gas15_XinKer_acceptance_infor_Bean> select_gas_XinKer_acceptance_infor(Guiji_gas15_XinKer_acceptance_infor_Bean bean);
+    public List<Guiji_gas16_XinKer_disposition_info_Bean> select_gas_XinKer_disposition_infor(Guiji_gas16_XinKer_disposition_info_Bean bean);
 }

+ 2 - 2
test-api/src/main/java/com/sooka/service/Guiji_Gas_Service.java

@@ -48,6 +48,6 @@ public interface Guiji_Gas_Service {
     public ResultModel select_gas_SC_gas_purchase_infor(Guiji_gas12_SC_gas_purchase_infor_Bean bean);
     public ResultModel select_gas_SC_meter_reading_infor(Guiji_gas13_SC_meter_reading_infor_Bean bean);
     public ResultModel select_gas_XinKer_user_infor(Guiji_gas14_XinKer_user_infor_Bean bean);
-    public ResultModel select_gas_XinKer_gas_meter_infor(Guiji_gas15_XinKer_acceptance_infor_Bean bean);
-    public ResultModel select_gas_XinKer_gas_purchase_infor(Guiji_gas16_XinKer_disposition_info_Bean bean);
+    public ResultModel select_gas_XinKer_acceptance_infor(Guiji_gas15_XinKer_acceptance_infor_Bean bean);
+    public ResultModel select_gas_XinKer_disposition_infor(Guiji_gas16_XinKer_disposition_info_Bean bean);
 }

+ 4 - 4
test-api/src/main/java/com/sooka/service/impl/Guiji_Gas_ServiceImpl.java

@@ -1460,7 +1460,7 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
      * @return 鑫科客户系统-受理信息
      */
     @Override
-    public ResultModel select_gas_XinKer_gas_meter_infor(Guiji_gas15_XinKer_acceptance_infor_Bean bean) {
+    public ResultModel select_gas_XinKer_acceptance_infor(Guiji_gas15_XinKer_acceptance_infor_Bean bean) {
         ResultModel r = getResultModel();
         Map log = new HashMap();
         log.put("operationStatus", "1");
@@ -1472,7 +1472,7 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
                 r.setCode(99999);
                 r.setMessage("受理编号"+check_required);
             }
-            List ls = guiji_gas_mapper2.select_gas_XinKer_gas_meter_infor(bean);
+            List ls = guiji_gas_mapper2.select_gas_XinKer_acceptance_infor(bean);
             r.setData(ls);
             r.setCode(00000);
             r.setMessage("成功");
@@ -1496,7 +1496,7 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
      * @return 鑫科客户系统-处理信息
      */
     @Override
-    public ResultModel select_gas_XinKer_gas_purchase_infor(Guiji_gas16_XinKer_disposition_info_Bean bean) {
+    public ResultModel select_gas_XinKer_disposition_infor(Guiji_gas16_XinKer_disposition_info_Bean bean) {
         ResultModel r = getResultModel();
         Map log = new HashMap();
         log.put("operationStatus", "1");
@@ -1508,7 +1508,7 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
                 r.setCode(99999);
                 r.setMessage("接单人员"+check_required);
             }
-            List ls = guiji_gas_mapper2.select_gas_XinKer_gas_purchase_infor(bean);
+            List ls = guiji_gas_mapper2.select_gas_XinKer_disposition_infor(bean);
             r.setData(ls);
             r.setCode(00000);
             r.setMessage("成功");

+ 2 - 2
test-api/src/main/resources/mapper/Guiji_Gas_Mapper2.xml

@@ -1119,7 +1119,7 @@
         </if>
     </select>
 
-    <select id="select_gas_XinKer_gas_meter_infor" resultType="com.sooka.model.bo.Guiji_gas15_XinKer_acceptance_infor_Bean" parameterType="com.sooka.model.bo.Guiji_gas15_XinKer_acceptance_infor_Bean">
+    <select id="select_gas_XinKer_acceptance_infor" resultType="com.sooka.model.bo.Guiji_gas15_XinKer_acceptance_infor_Bean" parameterType="com.sooka.model.bo.Guiji_gas15_XinKer_acceptance_infor_Bean">
         select id, Number, Datetime, Acceptor, Information, TaskType, BusinessType, DetailedInformation, Content from t_guiji_gas_xinker_acceptance_infor
         where 1=1
         <if test="Number != null and Number != ''">
@@ -1127,7 +1127,7 @@
         </if>
     </select>
 
-    <select id="select_gas_XinKer_gas_purchase_infor" resultType="com.sooka.model.bo.Guiji_gas16_XinKer_disposition_info_Bean" parameterType="com.sooka.model.bo.Guiji_gas16_XinKer_disposition_info_Bean">
+    <select id="select_gas_XinKer_disposition_infor" resultType="com.sooka.model.bo.Guiji_gas16_XinKer_disposition_info_Bean" parameterType="com.sooka.model.bo.Guiji_gas16_XinKer_disposition_info_Bean">
         select id, ClerkOrdering, DateTime, Worker, ResultCode, Content from t_guiji_gas_xinker_disposition_info
         where 1=1
         <if test="ClerkOrdering != null and ClerkOrdering != ''">