优化

slibra-admin/src/main/java/com/slibra/web/controller/business/HandleDataController.java

@@ -7,8 +7,14 @@ import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
+import com.slibra.business.domain.TXinyiDaily;
 import com.slibra.business.domain.TXinyiIndustry;
+import com.slibra.business.domain.TXinyiLaboratory;
+import com.slibra.business.domain.TXinyiRobot;
+import com.slibra.business.mapper.TXinyiDailyMapper;
 import com.slibra.business.mapper.TXinyiIndustryMapper;
+import com.slibra.business.mapper.TXinyiLaboratoryMapper;
+import com.slibra.business.mapper.TXinyiRobotMapper;
 import com.slibra.common.core.controller.BaseController;
 import com.slibra.common.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -35,6 +41,15 @@ public class HandleDataController extends BaseController
     @Autowired
     private TXinyiIndustryMapper xinyiIndustryMapper;
 
+    @Autowired
+    private TXinyiDailyMapper xinyiDailyMapper;
+
+    @Autowired
+    private TXinyiLaboratoryMapper xinyiLaboratoryMapper;
+
+    @Autowired
+    private TXinyiRobotMapper xinyiRobotMapper;
+
 //    public static final String[] queryTags = {"信义污水厂JS_COD_Value","信义污水厂JS_PH_Value","信义污水厂JS_SS_Value","信义污水厂JS_ZL_Value","信义污水厂JS_ZA_Value","信义污水厂JS_AD_Value","信义污水厂JS_T_Value","信义污水厂进水泵房液位","信义污水厂出水瞬时流量","信义污水厂升级出水COD","信义污水厂升级出水PH","信义污水厂升级出水SS","信义污水厂升级出水TN","信义污水厂升级出水TP","信义污水厂升级出水氨氮","信义污水厂AIT202_Value","信义污水厂AIT203_Value","信义污水厂AIT207_Value","信义污水厂AIT206_Value","信义污水厂AIT209_Value","信义污水厂AIT210_Value","信义污水厂进水TDS","信义污水厂FT101_Value","信义污水厂SWCHHYHLB1_R_Value","信义污水厂SWCHHYHLB2_R_Value","信义污水厂SWCHHYHLB3_R_Value","信义污水厂SWCHHYHLB4_R_Value","信义污水厂SWCHHYHLB5_R_Value","信义污水厂SWCHHYHLB6_R_Value","信义污水厂SWCWNHLB1_R_Value","信义污水厂SWCWNHLB2_R_Value","信义污水厂SWCWNHLB3_R_Value","信义污水厂SWCWNHLB4_R_Value","信义污水厂SWCWNHLB5_R_Value","信义污水厂GFJ1_R_Value","信义污水厂GFJ2_R_Value","信义污水厂GFJ3_R_Value","信义污水厂GFJ4_R_Value","信义污水厂GFJ5_R_Value","信义污水厂GFJ6_R_Value","信义污水厂GFJ1_KQLL_Value","信义污水厂GFJ2_KQLL_Value","信义污水厂GFJ3_KQLL_Value","信义污水厂GFJ4_KQLL_Value","信义污水厂GFJ5_KQLL_Value","信义污水厂GFJ6_KQLL_Value"};
 
 //    @GetMapping("/dateAdd")
@@ -393,44 +408,94 @@ public class HandleDataController extends BaseController
 
 
 
-    @GetMapping("/dateUpdateSJTYMinute")
-    public String dateUpdateSJTYMinute() {
-        log.info("进入了手动处理两个值的操作~~~~~~~~");
-        File file = new File("/home/slibra/历史数据");
-        if(file.isDirectory()){
-            for (File listFile : file.listFiles()) {
-                //        输入目录
-                ExcelReader reader = ExcelUtil.getReader(listFile);
-                List<List<Object>> readAll = reader.read();
-                if(!CollectionUtils.isEmpty(readAll)){
-                    for (int i = 3; i < readAll.size(); i++) {
-                        //解析数据
-                        List<Object> objects = readAll.get(i);
-                        String time = "20" + objects.get(0).toString().replaceAll(" ", "") + " " + objects.get(1).toString().replaceAll(" ", "").substring(0, 5);
-//                        System.out.println("time = " + time);
-                        TXinyiIndustry uniqueTXinyiIndustry = this.xinyiIndustryMapper.getUniqueTXinyiIndustry(time);
-                        if(!Objects.isNull(uniqueTXinyiIndustry)){
-                            TXinyiIndustry updateBean = new TXinyiIndustry();
-                            updateBean.setID(uniqueTXinyiIndustry.getID());
-                            BigDecimal CLJYSSLL = Objects.isNull(objects.get(2)) || String.valueOf(objects.get(2)).contains("-") ? null : new BigDecimal(String.valueOf(objects.get(2)));
-                            updateBean.setCLJYSSLL(CLJYSSLL);
-                            BigDecimal SJTYJLY = Objects.isNull(objects.get(3)) || String.valueOf(objects.get(3)).contains("-") ? null : new BigDecimal(String.valueOf(objects.get(3)));
-                            updateBean.setSJTYJLY(SJTYJLY);
-                            //如果两个都不为空再更新
-                            if(!Objects.isNull(CLJYSSLL) || !Objects.isNull(SJTYJLY)){
-                                this.xinyiIndustryMapper.updateTXinyiIndustry(updateBean);
-                            }else{
-                                log.error("要更新的两个字段全部为空--------");
-                            }
-                        }
-                    }
-                }
-                }
+//    @GetMapping("/dateUpdateSJTYMinute")
+//    public String dateUpdateSJTYMinute() {
+//        log.info("进入了手动处理两个值的操作~~~~~~~~");
+//        File file = new File("/home/slibra/历史数据");
+//        if(file.isDirectory()){
+//            for (File listFile : file.listFiles()) {
+//                //        输入目录
+//                ExcelReader reader = ExcelUtil.getReader(listFile);
+//                List<List<Object>> readAll = reader.read();
+//                if(!CollectionUtils.isEmpty(readAll)){
+//                    for (int i = 3; i < readAll.size(); i++) {
+//                        //解析数据
+//                        List<Object> objects = readAll.get(i);
+//                        String time = "20" + objects.get(0).toString().replaceAll(" ", "") + " " + objects.get(1).toString().replaceAll(" ", "").substring(0, 5);
+////                        System.out.println("time = " + time);
+//                        TXinyiIndustry uniqueTXinyiIndustry = this.xinyiIndustryMapper.getUniqueTXinyiIndustry(time);
+//                        if(!Objects.isNull(uniqueTXinyiIndustry)){
+//                            TXinyiIndustry updateBean = new TXinyiIndustry();
+//                            updateBean.setID(uniqueTXinyiIndustry.getID());
+//                            BigDecimal CLJYSSLL = Objects.isNull(objects.get(2)) || String.valueOf(objects.get(2)).contains("-") ? null : new BigDecimal(String.valueOf(objects.get(2)));
+//                            updateBean.setCLJYSSLL(CLJYSSLL);
+//                            BigDecimal SJTYJLY = Objects.isNull(objects.get(3)) || String.valueOf(objects.get(3)).contains("-") ? null : new BigDecimal(String.valueOf(objects.get(3)));
+//                            updateBean.setSJTYJLY(SJTYJLY);
+//                            //如果两个都不为空再更新
+//                            if(!Objects.isNull(CLJYSSLL) || !Objects.isNull(SJTYJLY)){
+//                                this.xinyiIndustryMapper.updateTXinyiIndustry(updateBean);
+//                            }else{
+//                                log.error("要更新的两个字段全部为空--------");
+//                            }
+//                        }
+//                    }
+//                }
+//                }
+//            }
+//        return "ok";
+//    }
+
+
+    /**
+     * 手动处理日报数据 增加两个字段 时间和小时
+     * @return
+     */
+    @GetMapping("/dateUpdateDaily")
+    public String dateUpdateDaily() {
+        //获取全部数据
+        List<TXinyiDaily> tXinyiDailies = this.xinyiDailyMapper.selectTXinyiDailyList(null);
+        if(!CollectionUtils.isEmpty(tXinyiDailies)){
+            for (TXinyiDaily tXinyiDaily : tXinyiDailies) {
+                String handleTime = handleDate(tXinyiDaily.getTestTime());
+                tXinyiDaily.setTestTime(handleTime);
+                tXinyiDaily.setTestDate(handleTime);
+                //更新
+                this.xinyiDailyMapper.updateTXinyiDaily(tXinyiDaily);
             }
+        }
+        return "ok";
+    }
+
+
+    /**
+     * 手动处理化验数据 增加两个字段 时间和小时
+     * @return
+     */
+    @GetMapping("/dateUpdateHuaYan")
+    public String dateUpdateHuaYan() {
+        //获取全部数据
+        List<TXinyiLaboratory> tXinyiLaboratories = this.xinyiLaboratoryMapper.selectTXinyiLaboratoryList(null);
+        if(!CollectionUtils.isEmpty(tXinyiLaboratories)){
+            for (TXinyiLaboratory tXinyiLaboratory : tXinyiLaboratories) {
+                String handleTime = handleDate(tXinyiLaboratory.getTestTime());
+                tXinyiLaboratory.setTestTime(handleTime);//到分为止
+                tXinyiLaboratory.setTestDate(handleTime.substring(0, 12));
+                tXinyiLaboratory.setTestHour(handleTime.substring(0, 9));
+                //更新
+                this.xinyiLaboratoryMapper.updateTXinyiLaboratory(tXinyiLaboratory);
+            }
+        }
         return "ok";
     }
 
 
+    //机器人数据表 直接删除，重新同步视图，修改视图的逻辑
+
+
+
+
+
+
     public static void main(String[] args) {
 //        File file = new File("C:\\Users\\10109\\Desktop\\新程序\\历史数据");
 //        if(file.isDirectory()){
@@ -446,9 +511,18 @@ public class HandleDataController extends BaseController
 //        }
 
 
-        String str = "2022/17/11 19:00:1";
+        String str = "2022/7/11 19:00";
 //        String str = "2022/7/1";
 //        String str = "0:0:1";
+        String newStr = handleDate(str);
+        System.out.println(newStr);
+        System.out.println(str.substring(0, 12));
+        System.out.println(str.substring(0, 9));
+
+    }
+
+
+    public static String handleDate(String str){
         StringBuilder sb = new StringBuilder();
         if(str.contains(" ")){//包含空格 就是年月日时分秒了
             String[] split = str.split(" ");
@@ -463,11 +537,10 @@ public class HandleDataController extends BaseController
             }else {
                 sb.append(str);
             }
-        }
-        System.out.println(sb.toString());
+       }
+        return sb.toString();
     }
 
-
     public static StringBuilder addBeforeZero(StringBuilder sb, String str, String tag){
         String[] split = str.split(tag);
         int length = split.length;

slibra-quartz/src/main/java/com/slibra/quartz/task/RyTask.java

@@ -155,6 +155,9 @@ public class RyTask
                         industry = recordMap.get(k);
                     }
                     industry.setTestTime(k);
+                    //2024年4月15日11:19:52  额外增加2个字段
+                    industry.setTestDate(k.substring(0,10));
+                    industry.setTestHour(k.substring(0,13));
                     //解析值
                     String[] split = v.split("-");
                     String type = split[0];
@@ -291,7 +294,15 @@ public class RyTask
         //主
         if(!CollectionUtils.isEmpty(tXinyiRobots)){
             for (TXinyiRobot tXinyiRobot : tXinyiRobots) {
-                tXinyiRobot.setvDateTime(tXinyiRobot.getvDate() + tXinyiRobot.getvTime());
+                String date = handleDate(tXinyiRobot.getVDate().replaceAll(" ", ""));//有空格
+                String time = handleDate(tXinyiRobot.getVTime().replaceAll(" ", ""));//有空格
+                tXinyiRobot.setVDate(date);
+                tXinyiRobot.setVTime(time);
+                tXinyiRobot.setVDateTime(date + " " + time);
+                //处理给前端展示的字段
+                tXinyiRobot.setTestDate(date);//日期
+                tXinyiRobot.setTestHour(date + " " + time.substring(0, 2));//小时
+                tXinyiRobot.setTestTime(date + " " + time.substring(0, 5));//分钟
                 tXinyiRobot.setCreatedTime(new Date());
                 this.xinyiRobotMapper.insertTXinyiRobot(tXinyiRobot);
             }
@@ -299,10 +310,53 @@ public class RyTask
 
     }
 
+
+
+    public static String handleDate(String str){
+        StringBuilder sb = new StringBuilder();
+        if(str.contains(" ")){//包含空格 就是年月日时分秒了
+            String[] split = str.split(" ");
+            addBeforeZero(sb, split[0], "/");
+            sb.append(" ");
+            addBeforeZero(sb, split[1], ":");
+        }else{
+            if(str.contains("/")){//年月日
+                addBeforeZero(sb, str, "/");
+            }else if(str.contains(":")){//时分秒
+                addBeforeZero(sb, str, ":");
+            }else {
+                sb.append(str);
+            }
+        }
+        return sb.toString();
+    }
+
+    public static StringBuilder addBeforeZero(StringBuilder sb, String str, String tag){
+        String[] split = str.split(tag);
+        int length = split.length;
+        for (int i = 0; i < length; i++) {
+            String value = split[i];
+            Integer intValue = Integer.parseInt(value);
+            if(intValue < 10 && value.length() == 1){////防止有正确的情况 额外再补充字符串
+                sb.append(0).append(value);
+            }else{
+                sb.append(value);
+            }
+            if(i < length-1){
+                sb.append(tag);
+            }
+        }
+        return sb;
+    }
+
     public static void main(String[] args) {
-        LocalDateTime endTime = LocalDateTime.now();
+        /*LocalDateTime endTime = LocalDateTime.now();
         System.out.println("endTime = " + endTime);
         endTime = endTime.plusMinutes(60);
-        System.out.println("endTime = " + endTime);
+        System.out.println("endTime = " + endTime);*/
+        String str = "2024/04/15 09:55";
+        System.out.println(str);
+        System.out.println(str.substring(0,10));
+        System.out.println(str.substring(0,13));
     }
 }

slibra-system/src/main/java/com/slibra/business/domain/TXinyiRobot.java

@@ -3,6 +3,10 @@ package com.slibra.business.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.slibra.common.annotation.Excel;
@@ -14,7 +18,12 @@ import com.slibra.common.core.domain.BaseEntity;
  * @author slibra
  * @date 2024-03-30
  */
-public class TXinyiRobot extends BaseEntity
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TXinyiRobot
 {
     private static final long serialVersionUID = 1L;
 
@@ -33,6 +42,18 @@ public class TXinyiRobot extends BaseEntity
     @Excel(name = "时间日期")
     private String vDateTime;
 
+    /** 化验时间 精确到天 */
+    @Excel(name = "化验时间 精确到天")
+    private String testDate;
+
+    /** 化验时间 精确到小时 */
+    @Excel(name = "化验时间 精确到小时")
+    private String testHour;
+
+    /** 化验时间 精确到分钟 */
+    @Excel(name = "化验时间 精确到分钟")
+    private String testTime;
+
     /** 仪表COD（在线仪表） */
     @Excel(name = "仪表COD", readConverterExp = "在=线仪表")
     private BigDecimal codYb;
@@ -130,290 +151,4 @@ public class TXinyiRobot extends BaseEntity
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createdTime;
 
-    public void setID(Long ID) 
-    {
-        this.ID = ID;
-    }
-
-    public Long getID() 
-    {
-        return ID;
-    }
-    public void setvDate(String vDate) 
-    {
-        this.vDate = vDate;
-    }
-
-    public String getvDate() 
-    {
-        return vDate;
-    }
-    public void setvTime(String vTime) 
-    {
-        this.vTime = vTime;
-    }
-
-    public String getvTime() 
-    {
-        return vTime;
-    }
-    public void setvDateTime(String vDateTime) 
-    {
-        this.vDateTime = vDateTime;
-    }
-
-    public String getvDateTime() 
-    {
-        return vDateTime;
-    }
-    public void setCodYb(BigDecimal codYb) 
-    {
-        this.codYb = codYb;
-    }
-
-    public BigDecimal getCodYb() 
-    {
-        return codYb;
-    }
-    public void setCodJqr(BigDecimal codJqr) 
-    {
-        this.codJqr = codJqr;
-    }
-
-    public BigDecimal getCodJqr() 
-    {
-        return codJqr;
-    }
-    public void setCodYz(BigDecimal codYz) 
-    {
-        this.codYz = codYz;
-    }
-
-    public BigDecimal getCodYz() 
-    {
-        return codYz;
-    }
-    public void setTpHl1Jqr(BigDecimal tpHl1Jqr) 
-    {
-        this.tpHl1Jqr = tpHl1Jqr;
-    }
-
-    public BigDecimal getTpHl1Jqr() 
-    {
-        return tpHl1Jqr;
-    }
-    public void setTpHl2Jqr(BigDecimal tpHl2Jqr) 
-    {
-        this.tpHl2Jqr = tpHl2Jqr;
-    }
-
-    public BigDecimal getTpHl2Jqr() 
-    {
-        return tpHl2Jqr;
-    }
-    public void setTpRccJqr(BigDecimal tpRccJqr) 
-    {
-        this.tpRccJqr = tpRccJqr;
-    }
-
-    public BigDecimal getTpRccJqr() 
-    {
-        return tpRccJqr;
-    }
-    public void setTp1Yz(BigDecimal tp1Yz) 
-    {
-        this.tp1Yz = tp1Yz;
-    }
-
-    public BigDecimal getTp1Yz() 
-    {
-        return tp1Yz;
-    }
-    public void setTp2Yz(BigDecimal tp2Yz) 
-    {
-        this.tp2Yz = tp2Yz;
-    }
-
-    public BigDecimal getTp2Yz() 
-    {
-        return tp2Yz;
-    }
-    public void setTpRccYz(BigDecimal tpRccYz) 
-    {
-        this.tpRccYz = tpRccYz;
-    }
-
-    public BigDecimal getTpRccYz() 
-    {
-        return tpRccYz;
-    }
-    public void setNh31Jqr(BigDecimal nh31Jqr) 
-    {
-        this.nh31Jqr = nh31Jqr;
-    }
-
-    public BigDecimal getNh31Jqr() 
-    {
-        return nh31Jqr;
-    }
-    public void setNh32Jqr(BigDecimal nh32Jqr) 
-    {
-        this.nh32Jqr = nh32Jqr;
-    }
-
-    public BigDecimal getNh32Jqr() 
-    {
-        return nh32Jqr;
-    }
-    public void setNh31Yz(BigDecimal nh31Yz) 
-    {
-        this.nh31Yz = nh31Yz;
-    }
-
-    public BigDecimal getNh31Yz() 
-    {
-        return nh31Yz;
-    }
-    public void setNo3Hlc1Yz(BigDecimal no3Hlc1Yz) 
-    {
-        this.no3Hlc1Yz = no3Hlc1Yz;
-    }
-
-    public BigDecimal getNo3Hlc1Yz() 
-    {
-        return no3Hlc1Yz;
-    }
-    public void setNh32Yz(BigDecimal nh32Yz) 
-    {
-        this.nh32Yz = nh32Yz;
-    }
-
-    public BigDecimal getNh32Yz() 
-    {
-        return nh32Yz;
-    }
-    public void setNo3Hlc2Yz(BigDecimal no3Hlc2Yz) 
-    {
-        this.no3Hlc2Yz = no3Hlc2Yz;
-    }
-
-    public BigDecimal getNo3Hlc2Yz() 
-    {
-        return no3Hlc2Yz;
-    }
-    public void setNo3Hlj1Jqr(BigDecimal no3Hlj1Jqr) 
-    {
-        this.no3Hlj1Jqr = no3Hlj1Jqr;
-    }
-
-    public BigDecimal getNo3Hlj1Jqr() 
-    {
-        return no3Hlj1Jqr;
-    }
-    public void setNo3Hlj2Jqr(BigDecimal no3Hlj2Jqr) 
-    {
-        this.no3Hlj2Jqr = no3Hlj2Jqr;
-    }
-
-    public BigDecimal getNo3Hlj2Jqr() 
-    {
-        return no3Hlj2Jqr;
-    }
-    public void setTYLL(BigDecimal TYLL) 
-    {
-        this.TYLL = TYLL;
-    }
-
-    public BigDecimal getTYLL() 
-    {
-        return TYLL;
-    }
-    public void setNo3Qyc1Jqr(BigDecimal no3Qyc1Jqr) 
-    {
-        this.no3Qyc1Jqr = no3Qyc1Jqr;
-    }
-
-    public BigDecimal getNo3Qyc1Jqr() 
-    {
-        return no3Qyc1Jqr;
-    }
-    public void setNo3Qyc2Jqr(BigDecimal no3Qyc2Jqr) 
-    {
-        this.no3Qyc2Jqr = no3Qyc2Jqr;
-    }
-
-    public BigDecimal getNo3Qyc2Jqr() 
-    {
-        return no3Qyc2Jqr;
-    }
-    public void setNo3Qyc1Yz(BigDecimal no3Qyc1Yz) 
-    {
-        this.no3Qyc1Yz = no3Qyc1Yz;
-    }
-
-    public BigDecimal getNo3Qyc1Yz() 
-    {
-        return no3Qyc1Yz;
-    }
-    public void setNo3Qyc2Yz(BigDecimal no3Qyc2Yz) 
-    {
-        this.no3Qyc2Yz = no3Qyc2Yz;
-    }
-
-    public BigDecimal getNo3Qyc2Yz() 
-    {
-        return no3Qyc2Yz;
-    }
-    public void setJSLL(BigDecimal JSLL) 
-    {
-        this.JSLL = JSLL;
-    }
-
-    public BigDecimal getJSLL() 
-    {
-        return JSLL;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("ID", getID())
-            .append("vDate", getvDate())
-            .append("vTime", getvTime())
-            .append("vDateTime", getvDateTime())
-            .append("codYb", getCodYb())
-            .append("codJqr", getCodJqr())
-            .append("codYz", getCodYz())
-            .append("tpHl1Jqr", getTpHl1Jqr())
-            .append("tpHl2Jqr", getTpHl2Jqr())
-            .append("tpRccJqr", getTpRccJqr())
-            .append("tp1Yz", getTp1Yz())
-            .append("tp2Yz", getTp2Yz())
-            .append("tpRccYz", getTpRccYz())
-            .append("nh31Jqr", getNh31Jqr())
-            .append("nh32Jqr", getNh32Jqr())
-            .append("nh31Yz", getNh31Yz())
-            .append("no3Hlc1Yz", getNo3Hlc1Yz())
-            .append("nh32Yz", getNh32Yz())
-            .append("no3Hlc2Yz", getNo3Hlc2Yz())
-            .append("no3Hlj1Jqr", getNo3Hlj1Jqr())
-            .append("no3Hlj2Jqr", getNo3Hlj2Jqr())
-            .append("TYLL", getTYLL())
-            .append("no3Qyc1Jqr", getNo3Qyc1Jqr())
-            .append("no3Qyc2Jqr", getNo3Qyc2Jqr())
-            .append("no3Qyc1Yz", getNo3Qyc1Yz())
-            .append("no3Qyc2Yz", getNo3Qyc2Yz())
-            .append("JSLL", getJSLL())
-            .append("createdTime", getCreatedTime())
-            .toString();
-    }
 }

slibra-system/src/main/resources/mapper/business/TXinyiRobotMapper.xml

@@ -3,10 +3,15 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.slibra.business.mapper.TXinyiRobotMapper">
-    
+
     <resultMap type="TXinyiRobot" id="TXinyiRobotResult">
+        <result property="ID"    column="ID"    />
         <result property="vDate"    column="V_DATE"    />
         <result property="vTime"    column="V_TIME"    />
+        <result property="vDateTime"    column="V_DATE_TIME"    />
+        <result property="testDate"    column="TEST_DATE"    />
+        <result property="testHour"    column="TEST_HOUR"    />
+        <result property="testTime"    column="TEST_TIME"    />
         <result property="codYb"    column="COD_YB"    />
         <result property="codJqr"    column="COD_JQR"    />
         <result property="codYz"    column="COD_YZ"    />
@@ -30,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="no3Qyc1Yz"    column="NO3_QYC_1_YZ"    />
         <result property="no3Qyc2Yz"    column="NO3_QYC_2_YZ"    />
         <result property="JSLL"    column="JSLL"    />
+        <result property="createdTime"    column="CREATED_TIME"    />
     </resultMap>
 
     <sql id="selectTXinyiRobotVo">
@@ -72,15 +78,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectTXinyiRobotByID" parameterType="Long" resultMap="TXinyiRobotResult">
         <include refid="selectTXinyiRobotVo"/>
-        where ID = #{ID} and del_flag = 0
+        where ID = #{ID}
     </select>
-        
+
     <insert id="insertTXinyiRobot" parameterType="TXinyiRobot" useGeneratedKeys="true" keyProperty="ID">
         insert into t_xinyi_robot
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="vDate != null">V_DATE,</if>
             <if test="vTime != null">V_TIME,</if>
             <if test="vDateTime != null">V_DATE_TIME,</if>
+            <if test="testDate != null">TEST_DATE,</if>
+            <if test="testHour != null">TEST_HOUR,</if>
+            <if test="testTime != null">TEST_TIME,</if>
             <if test="codYb != null">COD_YB,</if>
             <if test="codJqr != null">COD_JQR,</if>
             <if test="codYz != null">COD_YZ,</if>
@@ -105,11 +114,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="no3Qyc2Yz != null">NO3_QYC_2_YZ,</if>
             <if test="JSLL != null">JSLL,</if>
             <if test="createdTime != null">CREATED_TIME,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="vDate != null">#{vDate},</if>
             <if test="vTime != null">#{vTime},</if>
             <if test="vDateTime != null">#{vDateTime},</if>
+            <if test="testDate != null">#{testDate},</if>
+            <if test="testHour != null">#{testHour},</if>
+            <if test="testTime != null">#{testTime},</if>
             <if test="codYb != null">#{codYb},</if>
             <if test="codJqr != null">#{codJqr},</if>
             <if test="codYz != null">#{codYz},</if>
@@ -134,7 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="no3Qyc2Yz != null">#{no3Qyc2Yz},</if>
             <if test="JSLL != null">#{JSLL},</if>
             <if test="createdTime != null">#{createdTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateTXinyiRobot" parameterType="TXinyiRobot">
@@ -143,6 +155,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="vDate != null">V_DATE = #{vDate},</if>
             <if test="vTime != null">V_TIME = #{vTime},</if>
             <if test="vDateTime != null">V_DATE_TIME = #{vDateTime},</if>
+            <if test="testDate != null">TEST_DATE = #{testDate},</if>
+            <if test="testHour != null">TEST_HOUR = #{testHour},</if>
+            <if test="testTime != null">TEST_TIME = #{testTime},</if>
             <if test="codYb != null">COD_YB = #{codYb},</if>
             <if test="codJqr != null">COD_JQR = #{codJqr},</if>
             <if test="codYz != null">COD_YZ = #{codYz},</if>
@@ -168,18 +183,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="JSLL != null">JSLL = #{JSLL},</if>
             <if test="createdTime != null">CREATED_TIME = #{createdTime},</if>
         </trim>
-        ,revision = revision + 1
         where ID = #{ID}
     </update>
 
-    
-
     <delete id="deleteTXinyiRobotByID" parameterType="Long">
-        update t_xinyi_robot set del_flag = 2,revision = revision + 1 where del_flag = 0 and ID = #{ID}
+        delete from t_xinyi_robot where ID = #{ID}
     </delete>
 
     <delete id="deleteTXinyiRobotByIDs" parameterType="String">
-        update t_xinyi_robot set del_flag = 2,revision = revision + 1 where del_flag = 0 and ID in
+        delete from t_xinyi_robot where ID in
         <foreach item="ID" collection="array" open="(" separator="," close=")">
             #{ID}
         </foreach>