Your Name лет назад: 2
Родитель
Сommit
d853bd7bd7

+ 8 - 0
java110-bean/src/main/java/com/java110/po/log/AssetImportLogDetailPo.java

@@ -13,6 +13,8 @@ public class AssetImportLogDetailPo implements Serializable {
     private String communityId;
     private String message;
 
+    private String createTime;
+
     public String getDetailId() {
         return detailId;
     }
@@ -69,5 +71,11 @@ public class AssetImportLogDetailPo implements Serializable {
         this.message = message;
     }
 
+    public String getCreateTime() {
+        return createTime;
+    }
 
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
 }

+ 4 - 2
java110-db/src/main/resources/mapper/common/AssetImportLogDetailServiceDaoImplMapper.xml

@@ -16,9 +16,11 @@
     <insert id="saveAssetImportLogDetails" parameterType="Map">
         insert into asset_import_log_detail(
         detail_id,log_id,state,content,community_id,message
+            ,create_time
         ) values
         <foreach collection="assetImportLogDetailPos" item="item" separator=",">
-            (#{item.detailId},#{item.logId},#{item.state},#{item.content},#{item.communityId},#{item.message})
+            (#{item.detailId},#{item.logId},#{item.state},#{item.content},#{item.communityId},#{item.message}
+                ,#{item.createTime})
         </foreach>
     </insert>
 
@@ -50,7 +52,7 @@
         <if test="message !=null and message != ''">
             and t.message= #{message}
         </if>
-        order by t.create_time desc
+        order by t.create_time
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>

+ 4 - 0
service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java

@@ -27,6 +27,7 @@ import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
 
 /**
@@ -124,7 +125,9 @@ public class AssetImportSMOImpl extends DefaultAbstractComponentSMO implements I
         List<AssetImportLogDetailPo> assetImportLogDetailPos = new ArrayList<>();
         AssetImportLogDetailPo assetImportLogDetailPo = null;
         int flag = 0;
+        Calendar createTimeCal = Calendar.getInstance();
         for (Object data : datas) {
+            createTimeCal.add(Calendar.SECOND,1);
             assetImportLogDetailPo = new AssetImportLogDetailPo();
             assetImportLogDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId("11"));
             assetImportLogDetailPo.setLogId(logId);
@@ -132,6 +135,7 @@ public class AssetImportSMOImpl extends DefaultAbstractComponentSMO implements I
             assetImportLogDetailPo.setMessage("待导入");
             assetImportLogDetailPo.setCommunityId(result.getCommunityId());
             assetImportLogDetailPo.setContent(JSONObject.toJSONString(data));
+            assetImportLogDetailPo.setCreateTime(DateUtil.getFormatTimeStringA(createTimeCal.getTime()));
             assetImportLogDetailPos.add(assetImportLogDetailPo);
             if (assetImportLogDetailPos.size() > DEFAULT_ROWS) {
                 flag = assetImportLogDetailInnerServiceSMOImpl.saveAssetImportLogDetails(assetImportLogDetailPos);

+ 4 - 0
springboot/src/main/java/com/java110/boot/smo/assetImport/impl/AssetImportSMOImpl.java

@@ -28,6 +28,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -128,7 +129,9 @@ public class AssetImportSMOImpl extends DefaultAbstractComponentSMO implements I
         List<AssetImportLogDetailPo> assetImportLogDetailPos = new ArrayList<>();
         AssetImportLogDetailPo assetImportLogDetailPo = null;
         int flag = 0;
+        Calendar createTimeCal = Calendar.getInstance();
         for (Object data : datas) {
+            createTimeCal.add(Calendar.SECOND,1);
             assetImportLogDetailPo = new AssetImportLogDetailPo();
             assetImportLogDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId("11"));
             assetImportLogDetailPo.setLogId(logId);
@@ -136,6 +139,7 @@ public class AssetImportSMOImpl extends DefaultAbstractComponentSMO implements I
             assetImportLogDetailPo.setMessage("待导入");
             assetImportLogDetailPo.setCommunityId(result.getCommunityId());
             assetImportLogDetailPo.setContent(JSONObject.toJSONString(data));
+            assetImportLogDetailPo.setCreateTime(DateUtil.getFormatTimeStringA(createTimeCal.getTime()));
             assetImportLogDetailPos.add(assetImportLogDetailPo);
             if (assetImportLogDetailPos.size() > DEFAULT_ROWS) {
                 flag = assetImportLogDetailInnerServiceSMOImpl.saveAssetImportLogDetails(assetImportLogDetailPos);

+ 5 - 4
springboot/src/test/java/com/java110/AppTest.java

@@ -19,9 +19,10 @@ public class AppTest
     public void should()
     {
 
-        String body = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"><soap:Body><ns2:initTransResponse xmlns:ns2=\"http://ws.conflux.sunshine.com\"><String>&lt;result&gt;&lt;msg&gt;成功&lt;/msg&gt;&lt;code&gt;1&lt;/code&gt;&lt;token&gt;44190044897985894840&lt;/token&gt;&lt;/result&gt;</String></ns2:initTransResponse></soap:Body></soap:Envelope>";
-
-       String token = body.substring(body.indexOf("&lt;token&gt;")+13,body.indexOf("&lt;/token&gt;"));
-        System.out.println(token);
+        Calendar createTimeCal = Calendar.getInstance();
+        for (int i = 0; i< 100;i++) {
+            createTimeCal.add(Calendar.SECOND, 1);
+            System.out.println(DateUtil.getFormatTimeStringA(createTimeCal.getTime()));
+        }
     }
 }