Merge remote-tracking branch 'origin/master'

pom.xml

@@ -206,6 +206,12 @@
             <artifactId>poi</artifactId>
             <version>3.9</version>
         </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.3</version>
+        </dependency>
+
     </dependencies>
     <build>
         <finalName>cqnt</finalName>

src/main/java/com/founder/interservice/bkxx/controller/BkController.java

@@ -8,9 +8,9 @@ import com.founder.interservice.util.EasyUIPage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @Controller
@@ -18,21 +18,40 @@ public class BkController {
     @Autowired
     BkService bkService;
 
+    /**
+     * 标识号布控 新增界面
+     * @return
+     */
+    @RequestMapping(value = "/toBshbkInsertJsp")
+    public ModelAndView toBshbkInsertJsp(){
+        ModelAndView modelAndView = new ModelAndView("bkxx/bkxxInsert");
+        modelAndView.addObject("flag","bsh");
+        return modelAndView;
+    }
+    /**
+     * 损失设备布控 新增界面
+     * @return
+     */
+    @RequestMapping(value = "/toSssbbkInsertJsp")
+    public ModelAndView toSssbbkInsertJsp(){
+        ModelAndView modelAndView = new ModelAndView("bkxx/bkxxInsert");
+        modelAndView.addObject("flag","sssb");
+        return modelAndView;
+    }
     @RequestMapping(value = "/toBkxxListJsp")
     public String toBkxxListJsp(){
         return "/bkxx/bkxxlist";
     }
 
-    @RequestMapping(value ="/saveBkxx",method = {RequestMethod.GET,RequestMethod.POST})
-    public void saveBkxx(Bkxx bkxx){
-        if(bkxx != null){
-            bkService.insertBkxx(bkxx);
-        }
+    @RequestMapping(value ="/saveBkxx",method = {RequestMethod.POST})
+    @ResponseBody
+    public String saveBkxx( Bkxx bkxx){
+        return bkService.saveBkxx(bkxx);
     }
 
-    @RequestMapping(value = "/queryBkxxList")
+    @RequestMapping(value = "/queryBkxxList",method = {RequestMethod.GET,RequestMethod.POST})
     @ResponseBody
-    public Map<String,Object> queryBkxxList(@RequestBody BkxxFilter bkxxFilter,
+    public Map<String,Object> queryBkxxList(BkxxFilter bkxxFilter,
                                             @RequestParam(value = "page",defaultValue = "0") int page,
                                             @RequestParam(value = "rows",defaultValue = "0") int rows){
         Map<String,Object> objectMap = new HashMap<>();
@@ -50,4 +69,15 @@ public class BkController {
         }
         return objectMap;
     }
+
+    @RequestMapping("/updateBkztByXxzjbh")
+    @ResponseBody
+    public String updateBkztByXxzjbh(@RequestParam String  xxzjbh,@RequestParam String bkzt) {
+        Bkxx bkxx =new Bkxx();
+        bkxx.setXxzjbh(xxzjbh);
+        bkxx.setBkzt(bkzt);
+        bkService.updateBkxx(bkxx);
+        return "success";
+    }
+
 }

src/main/java/com/founder/interservice/bkxx/model/Bkxx.java

 package com.founder.interservice.bkxx.model;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
-
-import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
 
 
 @Entity
@@ -14,16 +14,39 @@ import java.util.Date;
 public class Bkxx {
     @Id
     private String xxzjbh;//信息主键编号
-    private String bkbsh; //布控标识号
+    private String bkdxhm;
+    private String bkdxlx;
+    private String bkdxlxmc;
+    private String bklx;
+    private String bkyj;
+    private String bkyq;
+    private String asjbh ;//案事件编号
+    @JSONField(format = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private java.util.Date bksj_start ;
+
+    @JSONField(format = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private java.util.Date bksj_end;
+    private String sqr_sfzh;
+    private String sqr_xm;
+    private String sqr_jh;
+    private String sqr_lxdh;
+    private String bkzt;//布控状态（0正常；1停止）
+    @JSONField(format = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private java.util.Date djsj;//登记时间
+    private String bkqx;//布控期限
+
+  /*  private String bkbsh; //布控标识号
     private String bshlxdm; //布控号类型代码
     private String bshlxmc;//布控号类型名称
-    private String asjbh ;//案事件编号
     private String bkrSfzh; //布控人身份证号
     private String bkrXm;//布控人姓名
     private String bkrJh;//布控人警号
     private String bkrLxdh;//布控人联系电话
-    private Date bkKssj;//布控开始时间
-    private String bkzt;//布控状态（0正常；1停止）
-    private Date djsj;//登记时间
+    private Date bkKssj;//布控开始时间*/
+
+
 
 }

src/main/java/com/founder/interservice/bkxx/model/BkxxFilter.java

@@ -5,13 +5,19 @@ import lombok.Data;
 @Data
 public class BkxxFilter {
     private String xxzjbh;//信息主键编号
-    private String bkbsh; //布控标识号
-    private String bshlxdm; //布控号类型代码
+    private String bkdxhm; //布控标识号
+    private String bkdxlx; //布控号类型代码
     private String asjbh ;//案事件编号
-    private String bkrSfzh; //布控人身份证号
-    private String bkrXm;//布控人姓名
-    private String bkrJh;//布控人警号
+    private String sqr_sfzh; //布控人身份证号
+    private String sqr_xm;//布控人姓名
+    private String sqr_jh;//布控人警号
     private String bkzt;//布控状态（0正常；1停止）
     private int startNum;
     private int endNum;
+
+
+    private String bkdxlxmc;
+    private String bksj_start;
+    private String bksj_end;
+    private String bkztmc;
 }

src/main/java/com/founder/interservice/bkxx/repository/BkxxRepository.java

+package com.founder.interservice.bkxx.repository;
+
+import com.founder.interservice.bkxx.model.Bkxx;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+
+
+public interface BkxxRepository extends JpaRepository<Bkxx,String> {
+
+
+}

src/main/java/com/founder/interservice/bkxx/service/BkService.java

@@ -17,12 +17,7 @@ import java.util.Map;
  */
 public interface BkService {
 
-    /**
-     * 保存布控信息
-     * @param bkxx
-     * @return
-     */
-    public void insertBkxx(Bkxx bkxx);
+    public String saveBkxx(Bkxx bkxx) ;
 
     /**
      * 分页查询布控信息
@@ -31,5 +26,5 @@ public interface BkService {
      * @throws InterServiceException
      */
     Map<String, Object> selectBkxxListPage(BkxxFilter bkxxFilter);
-
+    public int updateBkxx(Bkxx bkxx);
 }

src/main/java/com/founder/interservice/bkxx/service/impl/BkServiceImpl.java

@@ -2,35 +2,43 @@ package com.founder.interservice.bkxx.service.impl;
 
 import com.founder.interservice.bkxx.model.Bkxx;
 import com.founder.interservice.bkxx.model.BkxxFilter;
+import com.founder.interservice.bkxx.repository.BkxxRepository;
 import com.founder.interservice.bkxx.service.BkService;
 import com.founder.interservice.exception.InterServiceException;
 import com.founder.interservice.mapper.xzxt.BkxxMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 @Service
 public class BkServiceImpl implements BkService{
 
     @Autowired
     private BkxxMapper bkxxMapper;
+    @Autowired
+    BkxxRepository bkxxRepository;
 
     @Override
-    public void insertBkxx(Bkxx bkxx) {
+    public String saveBkxx(Bkxx bkxx) {
         //先查询是否存在这条数据（案事件编号、布控人警号、布控标识号、布控类型）
-        List<Bkxx> bkxxList = bkxxMapper.selectBkxx(bkxx);
-        if(bkxxList != null && bkxxList.size() > 0){
-            String flag = "已存在";
+        //获取客户端查询条件
+        String flag="success";
+        int bkxxs = bkxxMapper.selectBkxx(bkxx);
+        if(bkxxs<1){
+            bkxx.setXxzjbh(get32UUID());
+            bkxx.setDjsj(new Date());
+            bkxxRepository.save(bkxx);
         }else{
-            String uuid = UUID.randomUUID().toString().replaceAll("-","");
-            uuid = uuid.substring(0,uuid.length()-2);
-            bkxx.setXxzjbh(uuid);
-            bkxxMapper.insertBkxx(bkxx);
+             flag = "error";//已存在
+        }
+        return flag;
     }
+    //32位UUID
+    public static String get32UUID(){
+        UUID id=UUID.randomUUID();
+        String[] idd=id.toString().split("-");
+        return idd[0]+idd[1]+idd[2]+idd[3]+idd[4];
     }
 
     /**
@@ -41,11 +49,16 @@ public class BkServiceImpl implements BkService{
     @Override
     public Map<String, Object> selectBkxxListPage(BkxxFilter bkxxFilter) throws InterServiceException{
         Map<String, Object> resultMap = new HashMap<>();
-        List<Bkxx> bkxxLists = bkxxMapper.selectBkxxListPage(bkxxFilter);
+        List<BkxxFilter> bkxxLists = bkxxMapper.selectBkxxListPage(bkxxFilter);
         int total = bkxxMapper.selectBkxxListPageTotalCount(bkxxFilter);
         resultMap.put("rows",bkxxLists);
         resultMap.put("total",total);
         return resultMap;
     }
 
+    @Override
+    public int updateBkxx(Bkxx bkxx){
+        return bkxxMapper.updateBkxx(bkxx);
+    }
+
 }

src/main/java/com/founder/interservice/config/ScheduleConfig.java

@@ -16,6 +16,6 @@ public class ScheduleConfig implements SchedulingConfigurer {
     @Override
     public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
         //设定一个长度10的定时任务线程池
-        taskRegistrar.setScheduler(Executors.newScheduledThreadPool(10));
+        taskRegistrar.setScheduler(Executors.newScheduledThreadPool(20));
     }
 }

src/main/java/com/founder/interservice/config/filter/LogFilter.java

@@ -50,6 +50,11 @@ public class LogFilter implements Filter {
         String projectName = httpServletRequest.getParameter("projectName");
         String objTypeCode = httpServletRequest.getParameter("objType");
         String reqUri = httpServletRequest.getRequestURI();
+        if(reqUri.equals("/saveBkxx")||reqUri.equals("/updateBkztByXxzjbh")){//这两个url不进行过滤。如果过滤的话就必须传yhCate=00&projectName=00这两个参数。
+            //往下执行
+            filterChain.doFilter(httpServletRequest, servletResponse);
+        }
+        else{
             RequestLog requestLog = new RequestLog();
             requestLog.setRzlsh(KeyUtil.getUniqueKey("L"));
             requestLog.setFwsj(new Date());
@@ -139,6 +144,8 @@ public class LogFilter implements Filter {
             }
         }
 
+    }
+
     /**
      * 过滤器销毁方法
      */
@@ -146,4 +153,6 @@ public class LogFilter implements Filter {
     public void destroy() {
         System.out.println("过滤器销毁.............");
     }
+
+
 }

src/main/java/com/founder/interservice/mapper/xzxt/BkxxMapper.java

@@ -3,13 +3,16 @@ package com.founder.interservice.mapper.xzxt;
 import com.founder.interservice.bkxx.model.Bkxx;
 import com.founder.interservice.bkxx.model.BkxxFilter;
 import com.founder.interservice.exception.InterServiceException;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+@Mapper
 @Repository
 public interface BkxxMapper {
-    List<Bkxx> selectBkxx(Bkxx bkxx);
+    int selectBkxx(Bkxx bkxx);
 
     void insertBkxx(Bkxx bkxx);
 
@@ -19,7 +22,7 @@ public interface BkxxMapper {
      * @return
      * @throws InterServiceException
      */
-    List<Bkxx> selectBkxxListPage(BkxxFilter bkxxFilter);
+    List<BkxxFilter> selectBkxxListPage(BkxxFilter bkxxFilter);
 
     /**
      * 查询布控信息总数（和分页嵌套使用）
@@ -28,4 +31,9 @@ public interface BkxxMapper {
      * @throws InterServiceException
      */
     int selectBkxxListPageTotalCount(BkxxFilter bkxxFilter);
+
+    @Update("update tb_st_bkxx set bkzt=#{bkzt} where xxzjbh=#{xxzjbh}")
+    public int updateBkxx(Bkxx bkxx);
+
+
 }

src/main/java/com/founder/interservice/mapper/xzxt/RegionalTaskResultDetailMapper.java

@@ -21,4 +21,7 @@ public interface RegionalTaskResultDetailMapper {
     public int findRegionalTaskResultDetailListTotalCount(RegionalTaskResultDetail param) throws Exception;
     public  List<RegionalTaskResultDetail> getRegionalTaskResultDetailExcelList(RegionalTaskResultDetail param)throws  Exception;
 
+    public List<RegionalTaskResultDetail> getTogetherResultDetailList(RegionalTaskResultDetail param) throws Exception;
+    public int getTogetherResultDetailListTotalCount(RegionalTaskResultDetail param) throws Exception;
+
 }

src/main/java/com/founder/interservice/mapper/xzxt/RegionalTaskResultMapper.java

@@ -20,7 +20,11 @@ public interface RegionalTaskResultMapper {
     public List<RegionalTaskResult> findRegionalTaskResultList(QueryRegionalTaskResult param) throws Exception;
     public int findRegionalTaskResultListTotalCount(QueryRegionalTaskResult param) throws Exception;
     public List<RegionalTaskResult> findRegionalTaskResultListById(String taskId) throws Exception;
-    Integer regionalTaskDetailIsExist(String taskId) throws Exception;
+    Integer regionalTaskDetailIsExist(RegionalTaskResultDetail detail) throws Exception;
     public void saveRegionalTaskResultDetail(RegionalTaskResultDetail regionalTaskResultDetail) throws  Exception;
     public void updateRegionalTaskResultDetail(RegionalTaskResultDetail regionalTaskResultDetail) throws  Exception;
+
+    Integer togetherDetailIsExist(RegionalTaskResultDetail detail) throws Exception;
+    public void saveTogetherDetail(RegionalTaskResultDetail detail) throws  Exception;
+    public void updateTogetherDetail(RegionalTaskResultDetail detail) throws  Exception;
 }

src/main/java/com/founder/interservice/regionalanalysis/controller/RegionalAnalysisController.java

@@ -20,7 +20,6 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
-import sun.misc.BASE64Encoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.text.DecimalFormat;
@@ -67,13 +66,13 @@ public class RegionalAnalysisController {
         }else if("RUNNING".equals(task.getState())){
             state = "执行中";
         }else if("FINISHED".equals(task.getState())){
-            state = "数据处理中";
+            state = "标识号调取完成";
         }else if("TIMEOUT".equals(task.getState())){
             state = "计算超时";
         }else if("ERROR".equals(task.getState())){
             state = "执行错误";
-        }else if("HANDLE".equals(task.getState())){
-            state = "已完成";
+        }else if("END".equals(task.getState())){
+            state = "比对碰撞已完成";
         }
         String progress = "";
         if("1".equals(task.getProgress())){
@@ -240,13 +239,13 @@ public class RegionalAnalysisController {
                             taskVO.setState("运行中");
                             break;
                         case "FINISHED":
-                            taskVO.setState("数据处理中");
+                            taskVO.setState("标识号调取完成");
                             break;
                         case "TIMEOUT":
                             taskVO.setState("计算超时");
                             break;
-                        case "HANDLE":
-                            taskVO.setState("已完成");
+                        case "END":
+                            taskVO.setState("比对碰撞已完成");
                             break;
                         case "ERROR":
                             taskVO.setState("执行错误");
@@ -501,7 +500,7 @@ public class RegionalAnalysisController {
         ResultVO resultVO = null;
         try{
             //String taskId = "123123131231";
-            String taskId = HttpUtil.doPost(REGION_ALANALYSIS_URL,paramStr);
+            String taskId = HttpUtil.doPostJson(REGION_ALANALYSIS_URL,paramStr);
             if( null != taskId && !taskId.isEmpty() && !taskId.startsWith("Rate")){
                 JSONObject jsonObject = JSONObject.parseObject(paramStr);
                 RegionalTask regionalTask = new RegionalTask();
@@ -600,9 +599,7 @@ public class RegionalAnalysisController {
     private String clzp(RegionalTaskResultDetail tsaf) {
         String zp = null;
         if(tsaf.getRyzp() != null){
-            // 对字节数组Base64编码 处理图片
-            BASE64Encoder encoder = new BASE64Encoder();
-            zp = encoder.encode(tsaf.getRyzp());// 返回Base64编码过的字节数组字符串
+            zp = new String(tsaf.getRyzp());// 返回Base64编码过的字节数组字符串
         }
         return zp;
     }

src/main/java/com/founder/interservice/regionalanalysis/model/RegionalTaskResultDetail.java

 package com.founder.interservice.regionalanalysis.model;
 
 import lombok.Data;
-import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import java.util.Date;
 
 @Data
 @Entity
-@DynamicUpdate
-@Table(name = "REGIONALTASKRESULTDETAIL")
 public class RegionalTaskResultDetail {
 
     @Id
     private String XXZJBH;
-    @Transient
     private String taskId;
     private String taskResultId;
     private String objectType;
     private String objectTypeName;
     private String objectValue;
+    private int count; //伴随次数
     private String birthday;
     private String name;
     private byte[] ryzp;
@@ -33,14 +29,10 @@ public class RegionalTaskResultDetail {
     private String sex;
     private String zjlx;
     private String zjlxCode;
-    @Transient
+    private Date djsj;
     private int startNum;
-    @Transient
     private int endNum;
-    @Transient
     private String csrqStart;
-    @Transient
     private String csrqEnd;
-    @Transient
     private String ryzpStr;
 }

src/main/java/com/founder/interservice/regionalanalysis/repository/RegionalTaskResultRepository.java

 package com.founder.interservice.regionalanalysis.repository;
 
+import com.founder.interservice.regionalanalysis.model.RegionalTask;
 import com.founder.interservice.regionalanalysis.model.RegionalTaskResult;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
+import java.util.List;
+
 /**
  * @ClassName： RegionalRepository
  * @Auther： 曹鹏
@@ -12,5 +15,5 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
  * @Version: 1.0
  */
 public interface RegionalTaskResultRepository extends JpaRepository<RegionalTaskResult,String>,JpaSpecificationExecutor<RegionalTaskResult> {
-
+    public List<RegionalTaskResult> findAllByTaskId(String taskId);
 }

src/main/java/com/founder/interservice/regionalanalysis/service/RegionalAnalysisService.java

@@ -41,7 +41,7 @@ public interface RegionalAnalysisService {
     int findRegionalTaskResultListTotalCount(QueryRegionalTaskResult param) throws  Exception;
     List<RegionalTaskResult> findRegionalTaskResultListById(String taskId)throws  Exception;
 
-    boolean regionalTaskDetailIsExist(String xxzjbh) throws Exception;
+    boolean regionalTaskDetailIsExist(RegionalTaskResultDetail detail) throws Exception;
 
     public void saveRegionalTaskResultDetail(RegionalTaskResultDetail regionalTaskResultDetail) throws Exception;
     public void updateRegionalTaskResultDetail(RegionalTaskResultDetail regionalTaskResultDetail) throws Exception;

src/main/java/com/founder/interservice/regionalanalysis/service/impl/RegionalAnalysisServiceImpl.java

@@ -178,10 +178,10 @@ public class RegionalAnalysisServiceImpl implements RegionalAnalysisService {
     }
 
     @Override
-    public boolean regionalTaskDetailIsExist(String xxzjbh) {
+    public boolean regionalTaskDetailIsExist(RegionalTaskResultDetail detail) {
         boolean flag = false;
         try{
-            int count=regionalTaskResultMapper.regionalTaskDetailIsExist(xxzjbh);
+            int count=regionalTaskResultMapper.regionalTaskDetailIsExist(detail);
             if(count>0){
                 flag=true;
             }

src/main/java/com/founder/interservice/regionalanalysis/service/impl/TestSendTask.java

+package com.founder.interservice.regionalanalysis.service.impl;
+
+import com.founder.interservice.util.HttpUtil;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Random;
+
+import static com.founder.interservice.util.PropertieUtil.writeProperties;
+
+@Component
+@Async
+public class TestSendTask {
+
+    @Value(value = "${wabigdata.regionalAnalysisTask.url}")
+    private String REGION_ALANALYSIS_URL; //发送任务接口
+    @Value(value = "${wabigdata.trackTravelTogetherForPhoneTask.url}")
+    private String TOGETHER_TASK_URL;
+    /**
+     * 定时任务测试区域碰撞接口发送
+     * 定时线程  项目启动后两分钟后开始执行，每隔三分钟执行一次
+     */
+    @Scheduled(initialDelay = 1000,fixedDelay = 300000) //项目启动后1秒开始执行 每个五分钟执行一次
+    public void doTestSendTask(){
+        System.out.println("测试线程开始执行");
+        long day1 = System.currentTimeMillis();
+        String param0 = "{\"taskName\":\"0308测试任务碰撞\",\"perform\":{\"expression\":\"A1∩A2\",\"regional\":[{\"startTime\":1552017600000,\"endTime\":1552028400000,\"name\":\"A1\",\"source\":[0],\"lc\":[{\"j\":106.45365179918545,\"w\":29.72276345368788},{\"j\":106.451926590033,\"w\":29.715865237868453},{\"j\":106.4610922150265,\"w\":29.713692156324868},{\"j\":106.46306846181835,\"w\":29.721531105706845}]},{\"startTime\":1551999600000,\"endTime\":1552003200000,\"name\":\"A2\",\"source\":[0],\"lc\":[{\"j\":106.47868907688176,\"w\":29.739880302076706},{\"j\":106.47495138004449,\"w\":29.73141713703786},{\"j\":106.4876030212831,\"w\":29.728832496999747},{\"j\":106.49098157454996,\"w\":29.73848800075083}]}]},\"taskCaseId\":\"A5002316100002010125009\"}";
+        String param1 = "{\"taskName\":\"0308测试数据2\",\"perform\":{\"expression\":\"A1∩A2∩A3\",\"regional\":[{\"startTime\":1551999600000,\"endTime\":1552006800000,\"name\":\"A1\",\"source\":[0],\"lc\":[{\"j\":106.48005544068074,\"w\":29.740317929307647},{\"j\":106.47717991858055,\"w\":29.733483884898916},{\"j\":106.487602981047,\"w\":29.729836485935863},{\"j\":106.49098157194565,\"w\":29.738551000033393}]},{\"startTime\":1552024800000,\"endTime\":1552032000000,\"name\":\"A2\",\"source\":[0],\"lc\":[{\"j\":106.45424901331486,\"w\":29.721526874468},{\"j\":106.45194961015589,\"w\":29.715507218808916},{\"j\":106.46251664004187,\"w\":29.71292474618398},{\"j\":106.46416978345204,\"w\":29.721141012674796}]},{\"startTime\":1552006800000,\"endTime\":1552014000000,\"name\":\"A3\",\"source\":[0],\"lc\":[{\"j\":106.58392451501742,\"w\":29.64318553331031},{\"j\":106.5831524663565,\"w\":29.636814327637232},{\"j\":106.59168777893633,\"w\":29.636053074748915},{\"j\":106.59156256674235,\"w\":29.64322514505666}]}]},\"taskCaseId\":\"A5002316100002010125009\"}";
+        String param2 = "{\"taskName\":\"0308测试数据4\",\"perform\":{\"expression\":\"A1∩A2∩A3∩A4\",\"regional\":[{\"startTime\":1551999600000,\"endTime\":1552006800000,\"name\":\"A1\",\"source\":[0],\"lc\":[{\"j\":106.48027044321213,\"w\":29.741696698155923},{\"j\":106.47574257055277,\"w\":29.732168337439152},{\"j\":106.48975961496463,\"w\":29.72908133193557},{\"j\":106.49392941328695,\"w\":29.738171047468047}]},{\"startTime\":1552017600000,\"endTime\":1552032000000,\"name\":\"A2\",\"source\":[0],\"lc\":[{\"j\":106.45439301623477,\"w\":29.722467721445025},{\"j\":106.45101436816898,\"w\":29.715069150192157},{\"j\":106.46266069910358,\"w\":29.712422607924626},{\"j\":106.46524813252731,\"w\":29.719884951342372}]},{\"startTime\":1552006800000,\"endTime\":1552014000000,\"name\":\"A3\",\"source\":[0],\"lc\":[{\"j\":106.58424758119362,\"w\":29.644001213955516},{\"j\":106.58291843613114,\"w\":29.63546456416532},{\"j\":106.59474361876339,\"w\":29.63510813983358},{\"j\":106.59467135759317,\"w\":29.644807140999305}]},{\"startTime\":1551931200000,\"endTime\":1551938400000,\"name\":\"A4\",\"source\":[0],\"lc\":[{\"j\":107.3790778161817,\"w\":30.309489039553455},{\"j\":107.37631263222399,\"w\":30.306961472257793},{\"j\":107.37931191647654,\"w\":30.304610307340198},{\"j\":107.38302982364938,\"w\":30.30771577718766}]}]},\"taskCaseId\":\"A5002316100002010125009\"}";
+        Random ra =new Random();
+        int i = ra.nextInt(2);
+        String taskId = null;
+        String name = new SimpleDateFormat("yyyy年MM月dd日 HH时mm分ss秒").format(new Date());
+        int qycount = 0;
+        switch(i){
+            case 0:
+                qycount = 2;
+                break;
+            case 1:
+                qycount = 3;
+                break;
+            case 2:
+                qycount = 4;
+                break;
+        }
+        try{
+            switch(i){
+                case 0:
+                    taskId = HttpUtil.doPostJson(REGION_ALANALYSIS_URL,param0);
+                    break;
+                case 1:
+                    taskId = HttpUtil.doPostJson(REGION_ALANALYSIS_URL,param1);
+                    break;
+                case 2:
+                    taskId = HttpUtil.doPostJson(REGION_ALANALYSIS_URL,param2);
+                    break;
+            }
+            String logValue = null;
+            if ("Rate Limit".equals(taskId) || "null".equals(taskId)) {
+                logValue="区域碰撞日志：区域个数："+qycount + "；任务状态：FAIL；任务编号："+taskId+"；用时"+(System.currentTimeMillis()-day1+"毫秒");
+            }else if(taskId == null || "".equals(taskId)){
+                logValue="区域碰撞日志：区域个数："+qycount + "；任务状态：TIMEOUT；任务编号："+taskId+"；用时"+(System.currentTimeMillis()-day1+"毫秒");
+            }else{
+                logValue="区域碰撞日志：区域个数："+qycount + "；任务状态：SUCCESS；任务编号："+taskId+"；用时"+(System.currentTimeMillis()-day1+"毫秒");
+            }
+            writeProperties("regionalTaskLogFile.properties", name, logValue);
+        }catch (Exception e){
+            try{
+                e.printStackTrace();
+                String logValue="区域碰撞日志：区域个数："+ qycount + "；任务状态：TIMEOUT；任务编号：null；用时"+(System.currentTimeMillis()-day1+"毫秒");
+                writeProperties("regionalTaskLogFile.properties", name, logValue);
+            }catch (Exception e1){
+                e1.printStackTrace();
+            }
+        }
+    }
+
+    @Scheduled(initialDelay = 2000,fixedDelay = 300000) //项目启动后两秒开始执行一次 每个五分钟执行一次
+    public void doTestTogetherSendTask(){
+        System.out.println("测试伴随线程开始执行");
+        long day1 = System.currentTimeMillis();
+        String taskId = null;
+        String name = "T"+new SimpleDateFormat("yyyy年MM月dd日 HH时mm分ss秒").format(new Date());
+        try{
+            String url = TOGETHER_TASK_URL + "&objectType=" + "460029789430171"
+                    + "&objectValue=" + "4314"
+                    + "&taskName="+"测试伴随任务"
+                    + "&taskCaseId=" + "A5001231231234234"
+                    + "&startTime=" + System.currentTimeMillis()
+                    + "&endTime=" + System.currentTimeMillis();
+            taskId = HttpUtil.getWaData(url);
+            String logValue = null;
+            if("Rate Limit".equals(taskId) || "null".equals(taskId)){
+                logValue="伴随任务：任务状态：FAIL；任务编号："+taskId+"；用时"+(System.currentTimeMillis()-day1+"毫秒");
+            }else if(taskId == null || "".equals(taskId)){
+                logValue="伴随任务：任务状态：TIMEOUT；任务编号："+taskId+"；用时"+(System.currentTimeMillis()-day1+"毫秒");
+            }else{
+                logValue="伴随任务：任务状态：SUCCESS；任务编号："+taskId+"；用时"+(System.currentTimeMillis()-day1+"毫秒");
+            }
+            writeProperties("TogetherTaskLogFile.properties", name, logValue);
+        }catch (Exception e){
+            try{
+                e.printStackTrace();
+                String logValue="伴随任务：任务状态：TIMEOUT；任务编号：null；用时"+(System.currentTimeMillis()-day1+"毫秒");
+                writeProperties("TogetherTaskLogFile.properties", name, logValue);
+            }catch (Exception e1){
+                e1.printStackTrace();
+            }
+        }
+    }
+}

src/main/java/com/founder/interservice/tracktraveltogether/service/TrackTogetherService.java

@@ -2,6 +2,7 @@ package com.founder.interservice.tracktraveltogether.service;
 
 import com.founder.interservice.exception.InterServiceException;
 import com.founder.interservice.regionalanalysis.model.RegionalTask;
+import com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail;
 import com.founder.interservice.tracktraveltogether.model.TogetherTaskResult;
 import com.founder.interservice.tracktraveltogether.model.TrackTogetherTask;
 import org.springframework.data.domain.Page;
@@ -29,4 +30,12 @@ public interface TrackTogetherService {
     public List<TogetherTaskResult> getTogetherTaskResultList(TogetherTaskResult taskParam);
 
     int getTogetherTaskResultListTotalCount(TogetherTaskResult taskParam);
+
+    public boolean togetherDetailIsExist(RegionalTaskResultDetail param) throws Exception;
+    public void saveTogetherDetail(RegionalTaskResultDetail detail) throws Exception;
+    public void updateTogetherDetail(RegionalTaskResultDetail detail) throws Exception;
+
+    public List<RegionalTaskResultDetail> getTogetherResultDetailList(RegionalTaskResultDetail taskParam) throws Exception;
+
+    public int getTogetherResultDetailListTotalCount(RegionalTaskResultDetail taskParam) throws Exception;
 }

src/main/java/com/founder/interservice/tracktraveltogether/service/impl/TrackTogetherServiceImpl.java

@@ -2,8 +2,11 @@ package com.founder.interservice.tracktraveltogether.service.impl;
 
 import com.founder.interservice.exception.InterServiceException;
 import com.founder.interservice.enums.ResultEnum;
+import com.founder.interservice.mapper.xzxt.RegionalTaskResultDetailMapper;
+import com.founder.interservice.mapper.xzxt.RegionalTaskResultMapper;
 import com.founder.interservice.mapper.xzxt.TogetherTaskResultMapper;
 import com.founder.interservice.mapper.xzxt.TrackTogetherMapper;
+import com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail;
 import com.founder.interservice.tracktraveltogether.model.TogetherTaskResult;
 import com.founder.interservice.tracktraveltogether.model.TrackTogetherTask;
 import com.founder.interservice.tracktraveltogether.repository.TogetherTaskResultRepository;
@@ -47,7 +50,10 @@ public class TrackTogetherServiceImpl implements TrackTogetherService {
     private TrackTogetherMapper trackTogetherMapper;
     @Autowired
     private TogetherTaskResultMapper togetherTaskResultMapper;
-
+    @Autowired
+    private RegionalTaskResultMapper regionalTaskResultMapper;
+    @Autowired
+    private RegionalTaskResultDetailMapper regionalTaskResultDetailMapper;
     /**
      *
      * @Description: 发送伴随任务 并且返回任务编号
@@ -63,14 +69,12 @@ public class TrackTogetherServiceImpl implements TrackTogetherService {
             String taskId = null;
             if(trackParam != null){
                 String url = TOGETHER_TASK_URL + "&objectType=" + trackParam.getObjectType()
-                        + "&objectValue=" + trackParam.getImsi()
+                        + "&objectValue=" + trackParam.getObjectValue()
                         + "&taskName="+trackParam.getTaskName()
                         + "&taskCaseId=" + trackParam.getTaskCaseId()
                         + "&startTime=" + trackParam.getStartTime().getTime()
                         + "&endTime=" + trackParam.getEndTime().getTime();
-                System.out.println(" 伴随------发送任务URL =================" + url);
-                taskId = HttpUtil.doGet(url);
-                //taskId = "1231231231";
+                taskId = HttpUtil.getWaData(url);
                 System.out.println("taskId ===============" +taskId);
             }
             return taskId;
@@ -166,4 +170,48 @@ public class TrackTogetherServiceImpl implements TrackTogetherService {
     public int getTogetherTaskResultListTotalCount(TogetherTaskResult taskParam) {
         return togetherTaskResultMapper.getTogetherTaskResultListTotalCount(taskParam);
     }
+
+    @Override
+    public boolean togetherDetailIsExist(RegionalTaskResultDetail param) throws Exception{
+        boolean bol = false;
+        try{
+            int i = regionalTaskResultMapper.togetherDetailIsExist(param);
+            if(i > 0){
+                bol = true;
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return bol;
+    }
+
+    @Override
+    public void saveTogetherDetail(RegionalTaskResultDetail detail) throws Exception {
+        regionalTaskResultMapper.saveTogetherDetail(detail);
+    }
+
+    @Override
+    public void updateTogetherDetail(RegionalTaskResultDetail detail) throws Exception {
+        regionalTaskResultMapper.updateTogetherDetail(detail);
+    }
+
+    /**
+     * 查询伴随任务结果的详情LIst
+     * @param taskParam
+     * @return
+     */
+    @Override
+    public List<RegionalTaskResultDetail> getTogetherResultDetailList(RegionalTaskResultDetail taskParam) throws Exception {
+        return regionalTaskResultDetailMapper.getTogetherResultDetailList(taskParam);
+    }
+    /**
+     * 查询伴随任务结果的详情总数 用语分页
+     * @param taskParam
+     * @return
+     */
+    @Override
+    public int getTogetherResultDetailListTotalCount(RegionalTaskResultDetail taskParam) throws Exception {
+        return regionalTaskResultDetailMapper.getTogetherResultDetailListTotalCount(taskParam);
+    }
+
 }

src/main/java/com/founder/interservice/util/PropertieUtil.java

+package com.founder.interservice.util;
+import java.io.*;
+import java.util.Enumeration;
+import java.util.Properties;
+import org.apache.log4j.Logger;
+public class PropertieUtil {
+ private static Logger logger = Logger.getLogger(PropertieUtil.class);
+ private PropertieUtil() {
+ }
+ /**
+  * 读取配置文件某属性
+  */
+ public static String readValue(String filePath, String key) {
+  Properties props = new Properties();
+  try {
+   // 注意路径以 / 开始，没有则处理
+   if (!filePath.startsWith("/"))
+    filePath = "/" + filePath;
+   InputStream in = PropertieUtil.class.getResourceAsStream(filePath);
+   props.load(in);
+   String value = props.getProperty(key);
+   return value;
+  } catch (Exception e) {
+   logger.error(e);
+   return null;
+  }
+ }
+ /**
+  * 打印配置文件全部内容（filePath，配置文件名，如果有路径，props/test.properties）
+  */
+ public static void readProperties(String filePath) {
+  Properties props = new Properties();
+  try {
+   // 注意路径以 / 开始，没有则处理
+   if (!filePath.startsWith("/"))
+    filePath = "/" + filePath;
+   InputStream in = PropertieUtil.class.getResourceAsStream(filePath);
+   props.load(in);
+   Enumeration<?> en = props.propertyNames();
+   // 遍历打印
+   while (en.hasMoreElements()) {
+    String key = (String) en.nextElement();
+    String Property = props.getProperty(key);
+    logger.info(key + ":" + Property);
+   }
+  } catch (Exception e) {
+   logger.error(e);
+  }
+ }
+ /**
+  * 将值写入配置文件
+  */
+ public static void writeProperties(String fileName, String parameterName, String parameterValue) throws Exception {
+     // 本地测试特别注意，如果是maven项目，请到\target目录下查看文件，而不是源代码下
+     // 注意路径不能加 / 了，加了则移除掉
+     if (fileName.startsWith("/")) fileName.substring(1);
+     String filePath = PropertieUtil.class.getResource("/").getPath()+fileName;
+     // 获取配置文件
+     Properties pps = new Properties();
+     InputStream in = new BufferedInputStream(new FileInputStream(filePath));
+     pps.load(in);
+     in.close();
+     OutputStream out = new FileOutputStream(filePath,true);//true表示追加打开，false表示每次都是清空重写
+     // 设置配置名称和值
+     pps.setProperty(parameterName, parameterValue);
+     // comments 等于配置文件的注释
+     pps.store(new OutputStreamWriter(out,"UTF-8"), "Update " + parameterName + " name");
+     out.flush();
+     out.close();
+ }
+ public static void main(String[] args) throws Exception {
+   //  readProperties("application.properties");
+   //  logger.info(readValue("jdbc.properties", "JAVABLOG_WRITE_URL"));
+   writeProperties("regionalTaskLogFile.properties", "serviceid", "2");
+   //logger.info(readValue("application.properties", "serviceid"));
+ }
+}
\ No newline at end of file

src/main/resources/mybatis/mapper/xzxt/BkxxMapper.xml

@@ -3,23 +3,23 @@
 <mapper namespace="com.founder.interservice.mapper.xzxt.BkxxMapper">
 
     <sql id = "bkxx_where_sql">
-        <if test="bkbsh != null and bkbsh != ''">
-            and t.BKBSH like CONCAT('%',#{bkbsh},'%')
+        <if test="bkdxhm != null and bkdxhm != ''">
+            and t.bkdxhm  like '%' || #{bkdxhm , jdbcType=VARCHAR } || '%'
         </if>
-        <if test="bshlxdm != null and bshlxdm != '' ">
-            and t.BSH_LXDM like CONCAT('%',#{bshlxdm},'%')
+        <if test="bkdxlx != null and bkdxlx != '' ">
+            and t.bkdxlx = #{bkdxlx}
         </if>
-        <if test="bkrJh != null and bkrJh != ''">
-            and t.BKR_JH like CONCAT('%',#{bkrJh},'%')
+        <if test="sqr_jh != null and sqr_jh != ''">
+            and t.sqr_jh like CONCAT(CONCAT('%',#{sqr_jh}),'%')
         </if>
         <if test="asjbh != null and asjbh != ''">
-            and t.ASJBH like CONCAT('%',#{asjbh},'%')
+            and t.ASJBH  LIKE '%' || #{asjbh , jdbcType=VARCHAR } || '%'
         </if>
-        <if test="bkrXm != null and bkrXm != ''">
-            and t.BKRXM like CONCAT('%',#{bkrXm},'%')
+        <if test="sqr_xm != null and sqr_xm != ''">
+            and t.sqr_xm like CONCAT(CONCAT('%',#{sqr_xm}),'%')
         </if>
-        <if test="bkrSfzh != null and bkrSfzh != ''">
-            and t.BKRSFZH like CONCAT('%',#{bkrSfzh},'%')
+        <if test="sqr_sfzh != null and sqr_sfzh != ''">
+            and t.sqr_sfzh like CONCAT(CONCAT('%',#{sqr_sfzh}),'%')
         </if>
         <if test="bkzt != null and bkzt != ''">
             and t.BKZT = #{bkzt}
@@ -30,72 +30,103 @@
         INSERT INTO TB_ST_BKXX
           (
           xxzjbh,
-          bkbsh,
-          bshlxdm,
-          bshlxmc,
+           bkdxhm,
+           bkdxlx,
+          bkdxlxmc,
+          bklx,
+          bkyj,
+          bkyq,
           asjbh,
-          bkr_Sfzh,
-          bkr_Xm,
-          bkr_Jh,
-          bkr_Lxdh,
-          bk_Kssj,
+          bksj_start ,
+          bksj_end,
+         sqr_sfzh,
+         sqr_xm,
+         sqr_jh,
+         sqr_lxdh,
          bkzt,
-          djsj
+         djsj,
+         bkqx
           )
         VALUES
           (
           #{xxzjbh},
-          #{bkbsh},
-          #{bshlxdm },
-          #{bshlxmc },
-          #{asjbh },
-          #{bkrSfzh },
-          #{bkrXm},
-          #{bkrJh},
-          #{bkrLxdh},
-          SYSDATE,
+          #{bkdxhm},
+          #{bkdxlx },
+          #{bkdxlxmc },
+          #{bklx },
+          #{bkyj },
+          #{bkyq},
+           #{asjbh},
+          #{bksj_start},
+          #{bksj_end},
+          #{sqr_sfzh},
+           #{sqr_xm},
+            #{sqr_jh},
+             #{sqr_lxdh},
               #{bkzt},
-          SYSDATE)
+          SYSDATE,
+          bkqx)
     </insert>
 
     <select id="selectBkxx" parameterType="com.founder.interservice.bkxx.model.Bkxx" resultType="java.lang.Integer">
         SELECT COUNT(*) FROM TB_ST_BKXX t
         <where>
-            <include refid = "bkxx_where_sql" />
+              1=1
+            <if test="sqr_jh != null and sqr_jh != ''">
+                AND t.sqr_jh= #{sqr_jh, jdbcType=VARCHAR }
+            </if>
+            <if test="asjbh != null and asjbh != ''">
+                and t.ASJBH= #{ASJBH, jdbcType=VARCHAR }
+            </if>
+            <if test="bkdxhm != null and bkdxhm != ''">
+                and t.bkdxhm= #{bkdxhm, jdbcType=VARCHAR }
+            </if>
+            <if test="bkdxlx != null and bkdxlx != '' ">
+                and t.bkdxlx= #{bkdxlx, jdbcType=VARCHAR }
+            </if>
+
         </where>
     </select>
     <!-- 布控信息列表查询界面 分页查询 -->
-    <select id = "selectBkxxListPage" parameterType="com.founder.interservice.bkxx.model.BkxxFilter" resultType="com.founder.interservice.bkxx.model.Bkxx">
-        select
-          t2.*
+    <select id="selectBkxxListPage" parameterType="com.founder.interservice.bkxx.model.BkxxFilter" resultType="com.founder.interservice.bkxx.model.BkxxFilter">
+        select *
         from (
-            select t1.*,
-            t1.rownum as rn
+        select
+        t1.*,
+        rownum as rn
         from (
-                SELECT
+        select
         t.XXZJBH as xxzjbh,
-                    t.BKBSH as bkbsh,
-                    t.BSHLXDM as bshlxdm,
-                    t.BSHLXMC as bshlxmc,
+        t.bkdxhm as bkdxhm,
+        t.bkdxlx,
+        t.bkdxlxmc,
         t.ASJBH as asjbh,
-                    t.BKR_SFZH as bkrSfzh,
-                    t.BKR_XM as bkrXm,
-                    t.BKR_JH as bkrJh,
-                    t.BKR_LXDH as bkrLxdh,
-                    t.BK_KSSJ as bkKssj,
-                    t.BKZT as spzt,
+        t.sqr_sfzh,
+        t.sqr_xm,
+        t.sqr_jh,
+        t.sqr_lxdh,
+
+        to_char(t.bksj_start,'yyyy-mm-dd') as bksj_start,
+        to_char(t.bksj_end,'yyyy-mm-dd') as bksj_end,
+        case when t.bkzt = '0' then '布控中'
+        when t.bkzt = '1' then '已撤销'
+        else 　　 ''
+        end
+        as bkztmc,
+        t.bkzt,
         t.DJSJ as djsj
         FROM TB_ST_BKXX t
         <where>
-                    <include refid = "bkxx_where_sql" />
+            <include refid="bkxx_where_sql"/>
         </where>
-            ) t1
+        order by t.DJSJ desc
+        )t1
         <where>
-                t1.rownum <![CDATA[ <= ]]> #{endNum }
+            and rownum <![CDATA[ <= ]]> #{endNum }
         </where>
         ) t2
         <where>
-            t2.rn <![CDATA[ >= ]]> #{startNum }
+            rn <![CDATA[ > ]]> #{startNum }
         </where>
     </select>
     <select id = "selectBkxxListPageTotalCount" parameterType="com.founder.interservice.bkxx.model.BkxxFilter" resultType="int">
@@ -104,5 +135,5 @@
     <where>
         <include refid = "bkxx_where_sql" />
     </where>
-    </select>
+</select>
 </mapper>
\ No newline at end of file

src/main/resources/mybatis/mapper/xzxt/RegionalTaskResultDetailMapper.xml

@@ -5,7 +5,7 @@
     <select id = "findRegionalTaskResultDetailListTotalCount" parameterType = "com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail" resultType="int" >
         select count(*)
         from TB_ST_REGIONALTASKRESULT t
-        left join REGIONALTASKRESULTDETAIL td on t.XXZJBH = td.TASK_RESULT_ID
+        left join REGIONALTASKRESULTDETAIL td on t.OBJECT_VALUE = td.OBJECT_VALUE AND t.OBJECT_TYPE = td.OBJECT_TYPE
         where t.TASK_ID = #{taskId}
         <if test="objectType!= null and objectType!= ''">
                   <choose>
@@ -48,7 +48,7 @@
                         td.ZJHM as zjhm,
                         td.SJHM as sjhm
                     from TB_ST_REGIONALTASKRESULT t
-                    left join REGIONALTASKRESULTDETAIL td on t.XXZJBH = td.TASK_RESULT_ID
+                    left join REGIONALTASKRESULTDETAIL td on t.OBJECT_VALUE = td.OBJECT_VALUE AND t.OBJECT_TYPE = td.OBJECT_TYPE
                       where t.TASK_ID = #{taskId}
                     <if test="objectType!= null and objectType!= ''">
                         <choose>
@@ -87,7 +87,7 @@
         td.ZJHM as zjhm,
         td.SJHM as sjhm
         from TB_ST_REGIONALTASKRESULT t
-        left join REGIONALTASKRESULTDETAIL td on t.XXZJBH = td.TASK_RESULT_ID
+        left join REGIONALTASKRESULTDETAIL td on t.OBJECT_VALUE = td.OBJECT_VALUE AND t.OBJECT_TYPE = td.OBJECT_TYPE
         where t.TASK_ID = #{taskId}
         <if test="objectType!= null and objectType!= ''">
             <choose>
@@ -103,4 +103,74 @@
         <if test="csrqStart!=null and csrqStart!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd')  <![CDATA[>=]]> to_date(#{csrqStart},'yyyy-MM-dd') </if>
         <if test="csrqEnd!=null and csrqEnd!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd')  <![CDATA[<=]]> to_date(#{csrqEnd},'yyyy-MM-dd') </if>
     </select>
+
+    <!-- 伴随 -->
+    <select id = "getTogetherResultDetailListTotalCount" parameterType = "com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail" resultType="int" >
+        select count(*)
+        from TB_ST_TOGETHERTASKRESULT t
+        left join TB_ST_TOGETHERRESULTDETAIL td on t.OBJECT_VALUE = td.OBJECT_VALUE AND t.OBJECT_TYPE = td.OBJECT_TYPE
+        where t.TASK_ID = #{taskId}
+        <if test="objectType!= null and objectType!= ''">
+            <choose>
+                <when test="objectType.indexOf(',') > 0">
+                    and t.OBJECT_TYPE in (${objectType})
+                </when>
+                <otherwise>
+                    and t.OBJECT_TYPE in (#{objectType})
+                </otherwise>
+            </choose>
+        </if>
+        <if test="objectValue!= null and objectValue!= ''">and t.OBJECT_VALUE LIKE '%'|| #{objectValue} || '%'</if>
+        <if test="csrqStart!=null and csrqStart!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd')  <![CDATA[>=]]> to_date(#{csrqStart},'yyyy-MM-dd') </if>
+        <if test="csrqEnd!=null and csrqEnd!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd')  <![CDATA[<=]]> to_date(#{csrqEnd},'yyyy-MM-dd') </if>
+
+    </select>
+
+    <select id="getTogetherResultDetailList" parameterType="com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail" resultType="com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail">
+        select t2.*
+        from (
+        select t1.*,
+        rownum as rn
+        from (
+        select
+        t.TASK_ID as taskId,
+        t.OBJECT_TYPE as objectType,
+        t.OBJECT_TYPE_NAME as objectTypeName,
+        t.OBJECT_VALUE as objectValue,
+        t.COUNT AS count,
+        t.DJSJ AS djsj,
+        td.TASK_RESULT_ID as taskResultId,
+        td.BIRTHDAY as birthday,
+        td.NAME as name,
+        td.RYZP as ryzp,
+        td.XZZDZMC as xzzDzmc,
+        td.CSDDZMC as csdDzmc,
+        td.ZJLX as zjlx,
+        td.ZJLX_CODE as zjlxCode,
+        td.AGE as age,
+        td.SEX as sex,
+        td.ZJHM as zjhm,
+        td.SJHM as sjhm
+        from TB_ST_TOGETHERTASKRESULT t
+        left join TB_ST_TOGETHERRESULTDETAIL td on t.OBJECT_VALUE = td.OBJECT_VALUE AND t.OBJECT_TYPE = td.OBJECT_TYPE
+        where t.TASK_ID = #{taskId}
+        <if test="objectType!= null and objectType!= ''">
+            <choose>
+                <when test="objectType.indexOf(',') > 0">
+                    and t.OBJECT_TYPE in (${objectType})
+                </when>
+                <otherwise>
+                    and t.OBJECT_TYPE in (#{objectType})
+                </otherwise>
+            </choose>
+        </if>
+        <if test="objectValue!= null and objectValue!= ''">and t.OBJECT_VALUE LIKE '%'|| #{objectValue} || '%'</if>
+        <if test="csrqStart!=null and csrqStart!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd')  <![CDATA[>=]]> to_date(#{csrqStart},'yyyy-MM-dd') </if>
+        <if test="csrqEnd!=null and csrqEnd!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd')  <![CDATA[<=]]> to_date(#{csrqEnd},'yyyy-MM-dd') </if>
+        order by t.DJSJ desc
+        ) t1
+        where rownum <![CDATA[ <= ]]> #{endNum}
+        ) t2
+        where rn <![CDATA[ > ]]> #{startNum}
+    </select>
 </mapper>
\ No newline at end of file

src/main/resources/mybatis/mapper/xzxt/RegionalTaskResultMapper.xml

@@ -68,11 +68,12 @@
         from TB_ST_REGIONALTASKRESULT t
         where t.TASK_ID = #{taskId}
     </select>
-    <select id = "regionalTaskDetailIsExist" parameterType = "java.lang.String" resultType="int" >
+    <select id = "regionalTaskDetailIsExist" parameterType = "com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail" resultType="int" >
         select count(*)
           from REGIONALTASKRESULTDETAIL t
         where
-        t.TASK_RESULT_ID = #{xxzjbh}
+                t.OBJECT_TYPE = #{objectType}
+               and t.OBJECT_VALUE = #{objectValue}
     </select>
     <insert id="saveRegionalTaskResultDetail" parameterType="com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail">
         INSERT INTO REGIONALTASKRESULTDETAIL(
@@ -91,7 +92,8 @@
           AGE,
           SEX,
           ZJLX,
-        ZJLX_CODE
+          ZJLX_CODE,
+          DJSJ
         )
         VALUES(
             <if test="XXZJBH != null and XXZJBH !=''">#{XXZJBH},</if>
@@ -124,26 +126,119 @@
             <if test="sex == null or sex ==''">NULL,</if>
             <if test="zjlx != null and zjlx !=''">#{zjlx},</if>
             <if test="zjlx == null or zjlx ==''">NULL,</if>
-        <if test="zjlxCode != null and zjlxCode !=''">#{zjlxCode}</if>
-        <if test="zjlxCode == null or zjlxCode ==''">NULL</if>
+            <if test="zjlxCode != null and zjlxCode !=''">#{zjlxCode},</if>
+            <if test="zjlxCode == null or zjlxCode ==''">NULL,</if>
+            SYSDATE
         )
     </insert>
     <update id="updateRegionalTaskResultDetail" parameterType="com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail">
-       UPDATE   REGIONALTASKRESULTDETAIL t SET
-        <if test="objectType != null and objectType !=''">t.OBJECT_TYPE = #{objectType}</if>
-        <if test="objectTypeName != null and objectTypeName !=''">,t.OBJECT_TYPE_NAME = #{objectTypeName}</if>
-        <if test="objectValue != null and objectValue !=''">,t.OBJECT_VALUE = #{objectValue}</if>
-        <if test="birthday != null and birthday !=''">,t.BIRTHDAY = #{birthday}</if>
-        <if test="name != null and name !=''">,t.NAME = #{name}</if>
-        <if test="ryzp != null and ryzp !=''">,t.RYZP = #{ryzp}</if>
-        <if test="xzzDzmc != null and xzzDzmc !=''">,t.XZZDZMC = #{xzzDzmc}</if>
-        <if test="csdDzmc != null and csdDzmc !=''">,t.CSDDZMC = #{csdDzmc}</if>
-        <if test="zjhm != null and zjhm !=''">,t.ZJHM = #{zjhm}</if>
-        <if test="sjhm != null and sjhm !=''">,t.SJHM = #{sjhm}</if>
-        <if test="age != null and age !=''">,t.AGE = #{age}</if>
-        <if test="sex != null and sex !=''">,t.SEX = #{sex}</if>
-        <if test="zjlx != null and zjlx !=''">,t.ZJLX = #{zjlx}</if>
-        <if test="zjlxCode != null and zjlxCode !=''">,t.ZJLX_CODE = #{zjlxCode}</if>
-        WHERE t.TASK_RESULT_ID=#{taskResultId}
+       UPDATE   REGIONALTASKRESULTDETAIL t
+        <set>
+            <if test="objectType != null and objectType !=''">t.OBJECT_TYPE = #{objectType},</if>
+            <if test="objectTypeName != null and objectTypeName !=''">t.OBJECT_TYPE_NAME = #{objectTypeName},</if>
+            <if test="objectValue != null and objectValue !=''">t.OBJECT_VALUE = #{objectValue},</if>
+            <if test="birthday != null and birthday !=''">t.BIRTHDAY = #{birthday},</if>
+            <if test="name != null and name !=''">t.NAME = #{name},</if>
+            <if test="ryzp != null and ryzp !=''">t.RYZP = #{ryzp},</if>
+            <if test="xzzDzmc != null and xzzDzmc !=''">t.XZZDZMC = #{xzzDzmc},</if>
+            <if test="csdDzmc != null and csdDzmc !=''">t.CSDDZMC = #{csdDzmc},</if>
+            <if test="zjhm != null and zjhm !=''">t.ZJHM = #{zjhm},</if>
+            <if test="sjhm != null and sjhm !=''">t.SJHM = #{sjhm},</if>
+            <if test="age != null and age !=''">t.AGE = #{age},</if>
+            <if test="sex != null and sex !=''">t.SEX = #{sex},</if>
+            <if test="zjlx != null and zjlx !=''">t.ZJLX = #{zjlx},</if>
+            <if test="zjlxCode != null and zjlxCode !=''">t.ZJLX_CODE = #{zjlxCode},</if>
+        </set>
+        WHERE
+            t.OBJECT_TYPE = #{objectType}
+            and t.OBJECT_VALUE = #{objectValue}
+    </update>
+
+    <!--查看伴随表中任务翻译结果表 -->
+    <select id = "togetherDetailIsExist" parameterType = "com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail" resultType="int" >
+        select count(*)
+          from TB_ST_TOGETHERRESULTDETAIL t
+        where
+                t.OBJECT_TYPE = #{objectType}
+               and t.OBJECT_VALUE = #{objectValue}
+    </select>
+    <insert id="saveTogetherDetail" parameterType="com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail">
+        INSERT INTO TB_ST_TOGETHERRESULTDETAIL(
+            XXZJBH,
+            TASK_RESULT_ID,
+            OBJECT_TYPE,
+            OBJECT_TYPE_NAME,
+            OBJECT_VALUE,
+            BIRTHDAY,
+            NAME,
+            RYZP,
+            XZZDZMC,
+            CSDDZMC,
+            ZJHM,
+            SJHM,
+            AGE,
+            SEX,
+            ZJLX,
+            ZJLX_CODE,
+            DJSJ
+        )
+        VALUES(
+        <if test="XXZJBH != null and XXZJBH !=''">#{XXZJBH},</if>
+        <if test="XXZJBH == null or XXZJBH ==''">NULL,</if>
+        <if test="taskResultId != null and taskResultId !='' ">#{taskResultId},</if>
+        <if test="taskResultId == null or taskResultId ==''">NULL,</if>
+        <if test="objectType != null and objectType !=''">#{objectType},</if>
+        <if test="objectType == null or objectType ==''">NULL,</if>
+        <if test="objectTypeName != null and objectTypeName !=''">#{objectTypeName},</if>
+        <if test="objectTypeName == null or objectTypeName ==''">NULL,</if>
+        <if test="objectValue != null and objectValue !=''">#{objectValue},</if>
+        <if test="objectValue == null or objectValue ==''">NULL,</if>
+        <if test="birthday != null and birthday !=''">#{birthday},</if>
+        <if test="birthday == null or birthday ==''">NULL,</if>
+        <if test="name != null and name !=''">#{name},</if>
+        <if test="name == null or name ==''">NULL,</if>
+        <if test="ryzp != null and ryzp !=''">#{ryzp},</if>
+        <if test="ryzp == null or ryzp ==''">NULL,</if>
+        <if test="xzzDzmc != null and xzzDzmc !=''">#{xzzDzmc},</if>
+        <if test="xzzDzmc == null or xzzDzmc ==''">NULL,</if>
+        <if test="csdDzmc != null and csdDzmc !=''">#{csdDzmc},</if>
+        <if test="csdDzmc == null or csdDzmc ==''">NULL,</if>
+        <if test="zjhm != null and zjhm !=''">#{zjhm},</if>
+        <if test="zjhm == null or zjhm ==''">NULL,</if>
+        <if test="sjhm != null and sjhm !=''">#{sjhm},</if>
+        <if test="sjhm == null or sjhm ==''">NULL,</if>
+        <if test="age != null and age !=''">#{age},</if>
+        <if test="age == null or age ==''">NULL,</if>
+        <if test="sex != null and sex !=''">#{sex},</if>
+        <if test="sex == null or sex ==''">NULL,</if>
+        <if test="zjlx != null and zjlx !=''">#{zjlx},</if>
+        <if test="zjlx == null or zjlx ==''">NULL,</if>
+        <if test="zjlxCode != null and zjlxCode !=''">#{zjlxCode},</if>
+        <if test="zjlxCode == null or zjlxCode ==''">NULL,</if>
+        SYSDATE
+        )
+    </insert>
+    <update id="updateTogetherDetail" parameterType="com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail">
+        UPDATE TB_ST_TOGETHERRESULTDETAIL t
+        <set>
+            <if test="objectType != null and objectType !=''">t.OBJECT_TYPE = #{objectType},</if>
+            <if test="objectTypeName != null and objectTypeName !=''">t.OBJECT_TYPE_NAME = #{objectTypeName},</if>
+            <if test="objectValue != null and objectValue !=''">t.OBJECT_VALUE = #{objectValue},</if>
+            <if test="birthday != null and birthday !=''">t.BIRTHDAY = #{birthday},</if>
+            <if test="name != null and name !=''">t.NAME = #{name},</if>
+            <if test="ryzp != null and ryzp !=''">t.RYZP = #{ryzp},</if>
+            <if test="xzzDzmc != null and xzzDzmc !=''">t.XZZDZMC = #{xzzDzmc},</if>
+            <if test="csdDzmc != null and csdDzmc !=''">t.CSDDZMC = #{csdDzmc},</if>
+            <if test="zjhm != null and zjhm !=''">t.ZJHM = #{zjhm},</if>
+            <if test="sjhm != null and sjhm !=''">t.SJHM = #{sjhm},</if>
+            <if test="age != null and age !=''">t.AGE = #{age},</if>
+            <if test="sex != null and sex !=''">t.SEX = #{sex},</if>
+            <if test="zjlx != null and zjlx !=''">t.ZJLX = #{zjlx},</if>
+            <if test="zjlxCode != null and zjlxCode !=''">t.ZJLX_CODE = #{zjlxCode},</if>
+            t.DJSJ = SYSDATE
+        </set>
+        WHERE
+        t.OBJECT_TYPE = #{objectType}
+        and t.OBJECT_VALUE = #{objectValue}
     </update>
 </mapper>
\ No newline at end of file

src/main/resources/static/common/easyui-window/js/easyui-lang-zh_CN.js

+if ($.fn.pagination){
+	$.fn.pagination.defaults.beforePageText = '第';
+	$.fn.pagination.defaults.afterPageText = '共{pages}页';
+	$.fn.pagination.defaults.displayMsg = '显示{from}到{to},共{total}记录';
+}
+if ($.fn.datagrid){
+	$.fn.datagrid.defaults.loadMsg = '正在处理，请稍待。。。';
+}
+if ($.fn.treegrid && $.fn.datagrid){
+	$.fn.treegrid.defaults.loadMsg = $.fn.datagrid.defaults.loadMsg;
+}
+if ($.messager){
+	$.messager.defaults.ok = '确定';
+	$.messager.defaults.cancel = '取消';
+}
+$.map(['validatebox','textbox','passwordbox','filebox','searchbox',
+		'combo','combobox','combogrid','combotree',
+		'datebox','datetimebox','numberbox',
+		'spinner','numberspinner','timespinner','datetimespinner'], function(plugin){
+	if ($.fn[plugin]){
+		$.fn[plugin].defaults.missingMessage = '该输入项为必输项';
+	}
+});
+if ($.fn.validatebox){
+	$.fn.validatebox.defaults.rules.email.message = '请输入有效的电子邮件地址';
+	$.fn.validatebox.defaults.rules.url.message = '请输入有效的URL地址';
+	$.fn.validatebox.defaults.rules.length.message = '输入内容长度必须介于{0}和{1}之间';
+	$.fn.validatebox.defaults.rules.remote.message = '请修正该字段';
+}
+if ($.fn.calendar){
+	$.fn.calendar.defaults.weeks = ['日','一','二','三','四','五','六'];
+	$.fn.calendar.defaults.months = ['一月','二月','三月','四月','五月','六月','七月','八月','九月','十月','十一月','十二月'];
+}
+if ($.fn.datebox){
+	$.fn.datebox.defaults.currentText = '今天';
+	$.fn.datebox.defaults.closeText = '关闭';
+	$.fn.datebox.defaults.okText = '确定';
+	$.fn.datebox.defaults.formatter = function(date){
+		var y = date.getFullYear();
+		var m = date.getMonth()+1;
+		var d = date.getDate();
+		return y+'-'+(m<10?('0'+m):m)+'-'+(d<10?('0'+d):d);
+	};
+	$.fn.datebox.defaults.parser = function(s){
+		if (!s) return new Date();
+		var ss = s.split('-');
+		var y = parseInt(ss[0],10);
+		var m = parseInt(ss[1],10);
+		var d = parseInt(ss[2],10);
+		if (!isNaN(y) && !isNaN(m) && !isNaN(d)){
+			return new Date(y,m-1,d);
+		} else {
+			return new Date();
+		}
+	};
+}
+if ($.fn.datetimebox && $.fn.datebox){
+	$.extend($.fn.datetimebox.defaults,{
+		currentText: $.fn.datebox.defaults.currentText,
+		closeText: $.fn.datebox.defaults.closeText,
+		okText: $.fn.datebox.defaults.okText
+	});
+}
+if ($.fn.datetimespinner){
+	$.fn.datetimespinner.defaults.selections = [[0,4],[5,7],[8,10],[11,13],[14,16],[17,19]]
+}

src/main/resources/static/css/append.css

+@charset "UTF-8";
+.main-cen-box {
+	padding: 0px;
+	margin-left:0px;
+}
+.Wdate {
+    padding: 4px 0 4px 0px !important;
+}
+/*覆盖easyui*/
+body .datagrid-cell{
+    white-space: inherit;
+    word-wrap: inherit;
+    overflow: inherit;
+}
\ No newline at end of file

src/main/resources/static/css/append_bkxx.css

+@charset "UTF-8";
+.main-cen-box {
+	padding: 0px;
+	margin-left:0px;
+}
+.Wdate {
+    padding: 4px 0 4px 0px !important;
+}
+/*覆盖easyui*/
+body .datagrid-cell{
+    white-space: inherit;
+    word-wrap: inherit;
+    overflow: inherit;
+}
\ No newline at end of file

src/main/resources/static/css/base_initialize.css

@@ -28,7 +28,8 @@ img {
 fieldset,
 img,
 input,
-button {
+button,
+select{
     border: none;
     padding: 0;
     margin: 0;

src/main/resources/static/css/bjzycx.css

@@ -20,8 +20,8 @@ li {
 /*****header*****/
 #header {
     width: 100%;
-    height: 80px;
-    line-height: 80px;
+    height: 65px;
+    line-height: 65px;
     background: url(../images/banner.jpg);
     color: #fff;
     position: relative;
@@ -55,7 +55,7 @@ li {
     float: left;
     width:400px;
     display: inline-block;
-    height: 80px;
+    height: 65px;
     margin-left: 24px;
     background: url(../images/jzgjcs.png);
 }
@@ -63,7 +63,7 @@ li {
     float: left;
     width:400px;
     display: inline-block;
-    height: 80px;
+    height: 65px;
     margin-left: 24px;
     background: url(../images/jzgjzs.png);
 }
@@ -71,7 +71,7 @@ li {
     float: left;
     width:400px;
     display: inline-block;
-    height: 80px;
+    height: 65px;
     margin-left: 24px;
     background: url(../images/cxrz.png);
 }
@@ -79,17 +79,18 @@ li {
     float: left;
     width:400px;
     display: inline-block;
-    height: 80px;
+    height: 65px;
     margin-left: 24px;
     background: url(../images/jzgjzs2.png);
 }
-.h_title5,.h_title6 {
+.h_title5,.h_title6,.h_title8 {
     float: left;
-    width:400px;
+    width:328px;
     display: inline-block;
-    height: 80px;
+    height: 65px;
     margin-left: 24px;
     background: url(../images/cqsprz.png);
+    background-size: auto 65px !important;
 }
 .h_title6 {
     background: url(../images/dlrz.png);
@@ -98,10 +99,15 @@ li {
     float: left;
     width:400px;
     display: inline-block;
-    height: 80px;
+    height: 65px;
     margin-left: 24px;
     background: url(../images/clkkgj.png);
 }
+.h_title8 {
+    width:360px;
+    height:65px;
+    background: url(../images/title_bkxxzs.png);
+}
 .color1{color:#ec704c;}
 .datebox-h{width:228px;height:24px;line-height: 24px;}
 /************menu*************/

src/main/resources/static/css/icon.css

+.icon-blank{
+	background:url('icons/blank.gif') no-repeat center center;
+}
+.icon-add{
+	background:url('icons/edit_add.png') no-repeat center center;
+}
+.icon-edit{
+	background:url('icons/pencil.png') no-repeat center center;
+}
+.icon-clear{
+	background:url('icons/clear.png') no-repeat center center;
+}
+.icon-remove{
+	background:url('icons/edit_remove.png') no-repeat center center;
+}
+.icon-save{
+	background:url('icons/filesave.png') no-repeat center center;
+}
+.icon-cut{
+	background:url('icons/cut.png') no-repeat center center;
+}
+.icon-ok{
+	background:url('icons/ok.png') no-repeat center center;
+}
+.icon-no{
+	background:url('icons/no.png') no-repeat center center;
+}
+.icon-cancel{
+	background:url('icons/cancel.png') no-repeat center center;
+}
+.icon-reload{
+	background:url('icons/reload.png') no-repeat center center;
+}
+.icon-search{
+	background:url('icons/search.png') no-repeat center center;
+}
+.icon-print{
+	background:url('icons/print.png') no-repeat center center;
+}
+.icon-help{
+	background:url('icons/help.png') no-repeat center center;
+}
+.icon-undo{
+	background:url('icons/undo.png') no-repeat center center;
+}
+.icon-redo{
+	background:url('icons/redo.png') no-repeat center center;
+}
+.icon-back{
+	background:url('icons/back.png') no-repeat center center;
+}
+.icon-sum{
+	background:url('icons/sum.png') no-repeat center center;
+}
+.icon-tip{
+	background:url('icons/tip.png') no-repeat center center;
+}
+.icon-filter{
+	background:url('icons/filter.png') no-repeat center center;
+}
+.icon-man{
+	background:url('icons/man.png') no-repeat center center;
+}
+.icon-lock{
+	background:url('icons/lock.png') no-repeat center center;
+}
+
+
+.icon-mini-add{
+	background:url('icons/mini_add.png') no-repeat center center;
+}
+.icon-mini-edit{
+	background:url('icons/mini_edit.png') no-repeat center center;
+}
+.icon-mini-refresh{
+	background:url('icons/mini_refresh.png') no-repeat center center;
+}
+
+.icon-large-picture{
+	background:url('icons/large_picture.png') no-repeat center center;
+}
+.icon-large-clipart{
+	background:url('icons/large_clipart.png') no-repeat center center;
+}
+.icon-large-shapes{
+	background:url('icons/large_shapes.png') no-repeat center center;
+}
+.icon-large-smartart{
+	background:url('icons/large_smartart.png') no-repeat center center;
+}
+.icon-large-chart{
+	background:url('icons/large_chart.png') no-repeat center center;
+}

src/main/resources/static/css/style_bkxx.css

+html,body{
+    height: 100%;
+    overflow: hidden;
+    margin: 0;
+    padding: 0;
+}
+a:hover{    
+    color: #56AADC;
+    text-decoration: none;
+    cursor: pointer;
+}
+a:visited {    
+    color: #56AADC;   
+    text-decoration: none;   
+    }
+.red{color:red;font-weight: 600;}
+.cxtj{    
+    width: 100%;
+    margin: 0 auto;
+    box-shadow: 0px 5px 6px #898585;
+}
+/* 选中a标签 */
+.xzA:hover{
+    text-decoration: underline;
+}
+
+.heade-box{
+    position: relative;
+    height: 65px;
+    background: url(../images/banner.jpg) no-repeat center;
+    z-index: 100;
+}
+.header-title-img{
+    position: absolute;
+    left: 42px;
+    top: 0;
+}
+.user-message{
+    position: absolute;
+    top: 38px;
+    right: 50px;
+    color: #f60;
+}
+.left-min-menu{
+    width: 60px;
+    background-color:#274776;
+    color: #1f1f1f;
+    height: 100%;
+    overflow: auto;
+    position: fixed;
+    top: 0;
+    left: 0;
+    padding-top: 70px;
+}
+.left-min-menu ul li:first-child{
+    margin-top: 30px;
+}
+.left-min-menu li{
+    text-align: center;
+    height: 50px;
+    line-height: 50px;
+}
+.left-min-menu li:hover{
+    background-color: rgba(153, 153, 153, 0.6);
+}
+.left-min-menu li i{
+    font-size: 26px;
+}
+.left-menu-box{
+    position: fixed;
+    width: 230px;
+    background-color:rgba(43,77,122,1);/* #E0ECFF*/
+    height: 100%;
+    overflow: auto;
+    top: 0;
+    left: -230px;
+    padding-top: 70px;
+}
+.main-cen-box{
+    padding: 0 10px;
+    margin-left: 50px;
+    background-color: #fff;
+    /* height: 100%; */
+}
+.left-list-ftitle{
+    display: block;
+    height: 36px;
+    line-height: 36px;
+    padding-left: 15px;
+    font-size: 16px;
+    background-color: #274776;
+    opacity: 0.8;
+    color: #fff;
+    font-weight: bold;
+    position: relative;
+}
+a.left-list-ftitle:hover{
+    color: #fff;
+    background-color: #1d3d6d;
+}
+.left-list-ftitle span{
+    position: absolute;
+    top: 3px;;
+    right: 1px;
+    font-size: 18px;
+    color: #fff;
+}
+.left-list ul{
+    margin-left: 40px;
+}
+.left-list-ttitle{
+    font-size: 12px;
+    height: 28px;
+    line-height: 28px;
+    font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+}
+.call{
+    margin-left: 25px;
+    margin-top: 15px;
+    width: 180px;
+    height: 100px;
+    background-color: #fff;
+    box-shadow: 5px 5px 5px #ccc;
+    border-radius: 4px;
+    padding: 5px 10px;
+}
+.call dt{
+    text-align: center;
+    height: 28px;
+    line-height: 28px;
+    color: #474dd6;
+}
+.call dd{
+    height: 20px;
+    line-height: 20px;
+}
+/* 右侧 */
+.cxtj legend{
+    height: 36px;
+    line-height: 36px;
+    padding-left: 10px;
+    font-size: 14px;
+    background-color: #f1f1f1;
+    border: 1px solid #ccc;
+    border-bottom: 1px dashed #ccc;
+    color: #666;
+    font-weight: bold;
+    width: 100%;
+}
+.cxtj table{
+    border: 1px solid #ccc;
+    border-top: none;
+    width: 100%;
+    /* color:#0066CC; */
+    color:#333;
+    font-size: 14px;
+}
+.cxtj table tr{
+    border: 1px dashed #f2f2f2;
+}
+.cxtj table td{
+    /* border: 1px dashed #e5e5e5; */
+    margin-top: -1px;
+    height: 34px;
+    line-height: 34px;
+}
+.cxtj table td>.textbox ,.layout_table td>.textbox ,.layout_table_fp td>.textbox{
+    display: inline-block;
+    height: 28px;
+    line-height: 28px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    width: 80%;
+}
+.textbox .textbox{top:-2px;}
+.textbox .textbox-text{padding:0px !important;}
+.cxtj table .textbox-3{
+    width:92.5%;
+}
+.cxtj table input,.layout_table input,.layout_table_fp input,.textbox select {
+    /*height: 26px;*/
+    line-height: 26px;
+    margin-top: -4px;
+    width:100%;
+}
+.cxtj table .panel-noscroll{
+    border:none;
+}
+.cxtj table input[type=file],.layout_table input[type=file],.layout_table_fp input[type=file]{
+    border: 1px solid #ccc;
+}
+.radil_td{
+    /* color:#2180df; */
+    color:#333;
+    font-size: 12px;
+}
+.cxtj table input.radio_inp{
+    width: 15px;
+    margin-left: 3px;
+}
+.cxtj table textarea{
+    resize: vertical;    
+    border: 1px solid #ccc;
+    width: 95.5%;
+}
+.tr_hide{
+    display: none;
+}
+#arrow_span0{
+    display: inline-block;
+    width: 15px;
+    height: 15px;
+    background: url(../images/accordion_arrows.png) no-repeat -16px 0;
+}
+#arrow_span1{
+    display: none;
+    width: 15px;
+    height: 15px;
+    background: url(../images/accordion_arrows.png) no-repeat;
+}
+.btn_a{
+    padding: 5px 12px;
+    color: #fff;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    margin-right: 10px;
+}
+.btn_a:hover{
+    color: #fff;
+}
+.btn_search{
+    background-color: #3692C6;
+    border-color: #217cb1;
+}
+.btn_search:hover{
+    background-color: #217cb1;
+}
+.btn_empty{
+    background-color: #f60;
+    border-color: #d45602;
+}
+.btn_empty:hover{
+    background-color: #d45602;
+}
+.btn_add{
+    background-color: #3AB500;
+    border-color: #34B51E;
+}
+.btn_add:hover{
+    background-color: #3AB500;
+}
+.main-table-div{
+    margin-top: 10px;
+}
+.statistics{
+    background-color: #f1f1f1;
+    height: 36px;
+    line-height: 36px;
+    padding-left: 20px;
+    border: 1px solid #ccc;
+    border-bottom: none;
+}
+.st-span{
+    border-radius: 10px;
+    padding: 3px 5px;
+    background-color: #f60;
+    color: #fff;
+}
+/* 左侧菜单栏改版 */
+.left-list>li{
+    margin-bottom: 10px;
+}
+.left-list ul{
+    position: relative;
+    background-color:#fff;
+    margin: 10px;
+    border-radius: 5px;
+    /*padding-left: 10px;*/
+    
+}
+.left-list-ftitle{
+    margin:0 10px; 
+    border-radius: 5px;
+}
+.bot{
+    font-size: 0;
+    width: 0px;
+    height: 0px;
+    line-height: 0; 
+    border-width: 8px;
+    border-style: solid dashed dashed dashed;
+    border-color:transparent transparent #fff transparent;
+    position:absolute;
+    top:-16px;
+    right: 5px;
+    overflow: hidden;
+}
+.left-list-ttitle a{
+    color: #1a1a1a;
+    padding-left:10px;
+}
+.left-list-ftitle .fa{
+    font-size: 14px;
+    margin-right: 10px;
+}
+.necessary{
+    color: #f60;
+}
+.mask{
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    background: rgba(0, 0, 0, 0.5);
+    top: 0;
+    left: 0;
+    display: none;
+}
+.mask_hb{
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    background: rgba(0, 0, 0, 0.5);
+    top: 0;
+    left: 0;
+    display: none;
+}
+.mask_fp{
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    background: rgba(0, 0, 0, 0.5);
+    top: 0;
+    left: 0;
+    display: none;
+}
+div.layout{
+    width: 800px;
+    position: fixed;
+    left: 50%;
+    top: 50%;
+    margin-left: -400px;
+    margin-top: -250px;
+    box-shadow: 5px 5px 15px rgba(0, 0, 0, 0.4);
+    background: #fff;
+    border-radius: 8px;
+    display: none;
+}
+.layout_header{
+    height: 40px;
+    background: #274776;
+    line-height: 40px;
+    border-radius: 8px 8px 0 0;
+}
+.layout_content{
+    padding: 20px 5px 30px 5px;
+}
+.layout_header span{
+    font-size: 13px;
+    color: #f1f1f1;
+    margin-left: 15px;
+}
+.layout_table{
+    width: 100%;
+}
+.layout_table td{
+    height: 34px;
+    line-height: 34px;
+}
+.layout_table textarea{
+    resize: vertical;
+    border: 1px solid #ccc;
+    width: 92%;
+}
+.close_x{
+    margin-right: 20px;
+    margin-top:10px;
+    font-size: 16px;
+    color: #87a7bc;
+}
+.close_x:hover{
+    color: #9fdbf5;
+}
+div.layout_fp{
+    width: 800px;
+    position: fixed;
+    left: 50%;
+    top: 50%;
+    margin-left: -400px;
+    margin-top: -250px;
+    box-shadow: 5px 5px 15px rgba(0, 0, 0, 0.4);
+    background: #fff;
+    border-radius: 8px;
+    display: none;
+}
+.layout_header_fp{
+    height: 40px;
+    background: #274776;
+    line-height: 40px;
+    border-radius: 8px 8px 0 0;
+}
+.layout_content_fp{
+    padding: 20px 5px 30px 5px;
+}
+.layout_header_fp span{
+    font-size: 13px;
+    color: #f1f1f1;
+    margin-left: 15px;
+}
+.layout_table_fp{
+    width: 100%;
+}
+.layout_table_fp td{
+    height: 34px;
+    line-height: 34px;
+}
+.layout_table_fp textarea{
+    resize: vertical;
+    border: 1px solid #ccc;
+    width: 92%;
+}
+/*回报签收标签*/
+.re_hqzt{
+    border:1px solid #ccc;
+    border-radius:10px;
+    color:#fff;
+    padding:2px 3px;
+}
+a.re_hb{
+    background-color: #71a29e;
+}
+a.re_hb:hover{
+    background-color:#50a099;
+    color:#fff;
+}
+a.re_qs{
+    background-color: #b3896e;
+}
+a.re_qs:hover{
+    background-color: #b3734a;
+    color:#fff;
+}
+/*指令状态*/
+.zt_span{
+    font-size: 12px;
+    border: 1px solid #ccc;
+    padding: 3px;
+    color: #fff;
+}
+.qszt_span{
+    border-radius:10px;
+    background-color: #bb8866;
+}
+.hbzt_span{
+    border-radius:6px;
+    background-color: #7ca2c6;
+}
+.xbzt_span{
+    border-radius:2px;
+    background-color: #77aa99;
+}
+/* 试验添加右侧弹出框 */
+.re_qs {
+    position: relative;
+    /*width: fit-content;*/
+}
+.right_po{
+    width: fit-content;
+    border: 1px solid #ccc;
+    position: absolute;
+    display: none;
+    left: 42px;
+    top: 0px;
+    background:#d9f2ed;
+    box-shadow: 3px 3px 15px #666;
+}
+.right_po table{
+    width: 100%;
+    font-size: 12px;
+}
+.right_po table tr{
+    border-bottom: 1px dashed #ccc;
+}
+.right_po table tr:last-child{
+    border-bottom: none;
+}
+.right_po table th{
+    background:-webkit-gradient(linear, 0 0, 0 100%, from(#a3dfe6), to(#d9f2ed));
+    min-width: 100px;
+}
+.right_po table td,.right_po table th{
+    text-align: center;
+    height: 30px;
+    line-height: 30px;
+    padding: 3px 5px;
+    white-space: nowrap;
+}
+table.datagrid-btable td[field="zlwh"] .datagrid-cell{
+    overflow: visible;
+}
\ No newline at end of file

src/main/resources/static/js/bkxxInsert.js

+ $(function(){
+        $.extend($.fn.validatebox.defaults.rules, {
+            imei: {
+                validator: function (value) {
+                    var re=/^([A-Za-z0-9]{15})$/;
+                    return re.test(value);
+                },
+                message: "输入正确的(15位数字(英文字母))IMEI号!"
+            },
+            imsi: {
+                validator: function (value) {
+                    var re=/^([0-9]{15})$/;
+                    return re.test(value);
+                },
+                message: "输入正确的(15位数字)IMSI号!"
+            },
+            mobile: {
+                validator : function(value) {
+                    return /(^[1][3|4|5|7|8]{1}\d{9}$)/.test(value);
+                },
+                message : "请输入正确的移动电话"
+            },
+            cphm: {
+                validator: function (value) {
+                    var re=/^[\u4e00-\u9fa5]{1}[A-Z]{1}[A-Z_0-9]{5}$/;
+                    return re.test(value);
+                },
+
+                message: "请输入正确的车牌号码"
+            },
+            idCode:{
+                validator:function(value,param){
+                    return /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(value);
+                },
+                message: '请输入正确的身份证号'
+            },
+            QQ: {
+                validator: function (value, param) {
+                    return /^[1-9]\d{4,10}$/.test(value);
+                },
+                message: 'QQ号码不正确'
+            },
+            maxLength: {
+                validator: function (value, param) {
+                    if (param) {
+                        if (param[0] != undefined) {
+                            var len = $.trim(value.replace(/[^\x00-\xff]/g,'aaa')).length;
+                            if (len > param[0]) {
+                                return false;
+                            }
+                        }
+                    }
+                    return true;
+                },
+                message: "输入最多输入 {0} 个字符,一个汉字等于三个字符"
+            }
+
+
+        })
+
+    $("#bkdxlx").combobox({
+         onChange: function (lx,o) {
+             var validStr="";
+             if(lx=="001"){//手机
+                 validStr=['mobile'];
+             }else if(lx=="002"){//QQ号码
+                 validStr=['QQ'];
+             }else if(lx=="003"){//微信号码
+
+             }else if(lx=="004"){//身份证号
+                 validStr=['idCode'];
+             }else if(lx=="005"){//车牌号
+                 validStr=['cphm'];
+             }else if(lx=="009"){//微信ID
+
+             }else if(lx=="006"){//IMSI
+                 validStr=['imsi'];
+             }else if(lx=="007"){//IMEI
+                 validStr=['imei'];
+             }
+             if(validStr!=""){
+                 $("#bkdxhm").textbox({
+                     required: true,
+                     validType:validStr
+                 });
+             }
+         }
+     });
+
+    });
+
+ function submit() {
+     var bkdxlxmc=$('#bkdxlx').combobox('getText');//获取下拉框的文本
+     $('#bkdxlxmc').val(bkdxlxmc);
+     var bkdxlx=$("#bkdxlx").combobox('getValue');
+     $("#bkdxlx").combobox({
+         required: true
+     });
+     $("#bkdxlx").combobox('setValue',bkdxlx);
+
+
+     console.info($('#form1').serialize())
+     console.info($('#form1').serializeArray())
+
+     if($('#form1').form('enableValidation').form('validate')){
+         $.ajax({
+             method : 'post',
+             url : 'saveBkxx',
+             dateType:'json',
+             data : $('#form1').serializeArray(),
+             success:function(data){
+                 if(data=="success"){
+                     $.messager.show({title:'提示',msg:'保存成功'});
+                 }else{
+                     $.messager.show({title:'提示',msg:'数据已存在，不可重复提交'});
+                 }
+             },
+             error:function(e) {
+                 $.messager.show({title:'提示',msg:"出错："+e});
+             }
+         })
+     }
+
+ }
+
+function checkfinish(){
+    var day1=new Date($("#bksj_start").val());
+    var day2=new Date($("#bksj_end").val());
+    if($("#bksj_start").val()&&$("#bksj_end").val()!=""){
+        var z=(day2-day1)/86400000+"天";
+        $("#bkqx").val(z);
+    }
+}
+function doClear(){
+    $("#bkdxlx").combobox('setValue',"");
+    $("#bkdxhm").textbox('setValue',"");
+    $("#bklx").combobox('setValue',"");
+    $("#bkyj").val("");
+    $("#bkyq").val("");
+    $("#sqr_xm").val('');
+    $("#sqr_jh").val('');
+    $("#djsj").val('');
+    $("#bksj_start").val('');
+    $("#bksj_end").val('');
+    $("#bkqx").val("");
+}
\ No newline at end of file

src/main/resources/static/js/qypzjgxs.js

@@ -24,13 +24,13 @@ function doClear(){
         this.checked = false;
     });
 }
+//{title:"手机号码",field:"sjhm",align:'center',width:'20%'},手机号码暂时去掉
 var table_title =[
-    {title:"标识号",field:"objectValue",align:'center',width:'20%'},
+    {title:"标识号",field:"objectValue",align:'center',width:'30%'},
     {title:"标识号类型",field:"objectTypeName",align:'center',width:'10%'},
     {title:"姓名",field:"name",align:'center',width:'10%'},
-    {title:"证件类型",field:"zjlx",align:'center',width:'15%'},
-    {title:"证件号码",field:"zjhm",align:'center',width:'15%'},
-    {title:"手机号码",field:"sjhm",align:'center',width:'20%'},
+    {title:"证件类型",field:"zjlx",align:'center',width:'20%'},
+    {title:"证件号码",field:"zjhm",align:'center',width:'20%'},
     {title:"操作",field:"cz",align:'center',width:'10%',formatter:function(val,row,index){
         return getCzColumn(row);
     }},

src/main/resources/static/js/skgjbasjgzs.js

@@ -25,18 +25,20 @@ function doClear(){
     });
 }
 var table_title =[
-    {title:"类别参数",field:"objectValue",align:'center',width:'25%'},
-    {title:"类别代码",field:"objectType",align:'center',width:'15%'},
-    {title:"类别名称",field:"objectTypeName",align:'center',width:'15%'},
-    {title:"数量",field:"count",align:'center',width:'10%'},
-    {title:"登记时间",field:"djsj",align:'center',width:'25%'},
-    {title:"操作",field:"cz",align:'center',width:'10%',formatter:function(val,row,index){
+    {title:"标识号",field:"objectValue",align:'center',width:'10%'},
+    {title:"标识号类型",field:"objectTypeName",align:'center',width:'10%'},
+    {title:"伴随次数",field:"count",align:'center',width:'10%'},
+    {title:"姓名",field:"name",align:'center',width:'10%'},
+    {title:"证件类型",field:"zjlx",align:'center',width:'15%'},
+    {title:"证件号码",field:"zjhm",align:'center',width:'15%'},
+    {title:"入库时间",field:"djsj",align:'center',width:'15%'},
+    {title:"操作",field:"cz",align:'center',width:'15%',formatter:function(val,row,index){
         return getCzColumn(row);
     }},
 ];
 function doQuery(){
     $('#skgjbsjgzsTable').datagrid({
-        url: "/getTogetherTaskResultList",
+        url: "/getTogetherResultDetailList",
         columns : [table_title],
         queryParams:serializeObject($("form[name='skgjbsjgzsForm']")),
         striped: true,
@@ -73,61 +75,46 @@ function serializeObject(form){
 }
 
 function getCzColumn(row){
-    var str="<a href=\"javascript:;\" onclick=\"toSkgjbsjgzsDetail('"+row.taskId+"','"+row.objectType+"','"+row.objectValue+"');\" class=\"cz\"><span>结果显示</span></a>";
+    var str="<a href=\"javascript:;\" onclick=\"toZstp('"+row.xzzDzmc+"','"+row.sjhm+"','"+row.age+"','"+row.objectValue+"','"+row.objectTypeName+"','"+row.objectType+"','"+row.ryzpStr+"','"+row.name+"','"+row.birthday+"','"+row.zjlx+"','"+row.zjhm+"');\" class=\"cz\"><span>结果显示</span></a>";
     return str;
 }
-
-function toSkgjbsjgzsDetail(taskId,objType,objValue){
-    var param = {
-        "imsi":objValue,
-        "yhCate":"00",
-        "projectName":"刑专智慧侦查脑图"
-    }
-    var index = layer.load(1, {
-        content: '加载中',
-        shade: [0.35,'#fff'],
-        success: function(layero) {
-            layero.find('.layui-layer-content').css({
-                'padding-top': '40px',
-                'width': '70px',
-                'background-position-x': '2px'
-            });
-        }
-    });
-    $.ajax({
-        type:"POST",
-        data:param,
-        url:"/queryTogetherTaskDetail",
-        success:function(result) {
-            layer.close(index);
-            if(result){
-                var data = result.data;
+function toZstp(xzzDzmc,sjhm,age,objectValue,objectTypeName,objectType,ryzpStrs,name,birthday,zjlx,zjhm){
+    var cllxArr = ["6424","6422","6423","7888"];
     var ryzpStr = "";
-                if(data.ryzp){
-                        ryzpStr = "<img src=\"data:image/gif;base64," + data.ryzp + "\"/>";
+    if(ryzpStrs != "null" && ryzpStrs !=''){
+        ryzpStr = "<img src=\"data:image/gif;base64," + ryzpStrs + "\"/>";
     }else {
         ryzpStr = "<img src=\"/images/timg.jpg\" style = \"height:121px;width:100px;\"/>";
     }
-                    var name = data.name==null?"":data.name;
-                    var age =  data.age==null?"":data.age;
-                    var zjhm = data.zjhm==null?"":data.zjhm;
-                    var csrq = data.csrq==null?"":data.csrq;
-                    var sjhm = data.sjhm==null?"":data.sjhm;
-                    var xzzDzmc = data.xzzDzmc==null?"":data.xzzDzmc;
+    var objValue = objectValue== "null"?"":objectValue;
+    var objTypeName = objectTypeName=="null"?"":objectTypeName;
+    var zjlxx = zjlx=="null"?"":zjlx;
+    var zjhmm = zjhm=="null"?"":zjhm;
+    var agee = age=="null"?"":age;
+    var namee = name=="null"?"":name;
+    var birth = birthday=="null"?"":birthday;
+    var sj = sjhm=="null"?"":sjhm;
+    var xzz = xzzDzmc=="null"?"":xzzDzmc;
+    if(cllxArr.indexOf(objectType) > -1){
+        //车辆
+        $("#clRyzp").html(ryzpStr);
+        $("#cph").text(objValue);
+        $("#cllx").text(objTypeName);
+        $("#clZjlx").text(zjlxx);
+        $("#clZjhm").text(zjhmm);
+        openClxx();
+    }else {
+        //人员
         $("#ryzp").html(ryzpStr);
-                    $("#ryName").text(name);
-                    $("#ryAge").text(age);
-                    $("#rySfzh").text(zjhm);
-                    $("#ryCsrq").text(csrq);
-                    $("#ryDhhm").text(sjhm);
+        $("#ryName").text(namee);
+        $("#ryAge").text(agee);
+        $("#rySfzh").text(zjhmm);
+        $("#ryCsrq").text(birth);
+        $("#ryDhhm").text(sj);
         $("#imsi").text(objValue);
-                    $("#ryAddress").text(xzzDzmc);
+        $("#ryAddress").text(xzz);
         openRyxx();
     }
-        },
-        error:function () {
-        }
-    });
 }
 function openRyxx(){
     $('#ryjgzs').dialog({

src/main/resources/static/sql/S023.20190117_caopneg_创建布控信息表.txt

-INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S023',0);
+INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S023',0);
 INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S023',0);
 COMMIT;
 -------------------------------------------------------------------------------------------
+--如果表存在 则先删除
+drop TABLE XZXT.TB_ST_BKXX;
 
 --创建布控信息表
 CREATE TABLE XZXT.TB_ST_BKXX
 (
     XXZJBH varchar2(30 BYTE),
-    BKBSH varchar2(20),
-    BSHLXDM varchar2(10 BYTE),
-    BSHLXMC varchar2(50 BYTE),
+    BKDXHM varchar2(20 BYTE),
+    BKDXLX varchar2(10 BYTE),
+    BKDXLXMC varchar2(50 BYTE),
+    BKLX varchar2(10 BYTE),
+    BKYJ varchar2(2000 BYTE),
+    BKYQ varchar2(2000 BYTE),
 	ASJBH varchar2(50 BYTE),
-    BKR_SFZH varchar2(20 BYTE),
-    BKR_XM varchar2(50 BYTE),
-    BKR_JH varchar2(50 BYTE),
-    BKR_LXDH varchar2(15 BYTE),
-    BK_KSSJ DATE DEFAULT sysdate,
+	BKSJ_START DATE ,
+	BKSJ_END DATE,
+    SQR_SFZH varchar2(20 BYTE),
+    SQR_XM varchar2(50 BYTE),
+    SQR_JH varchar2(50 BYTE),
+    SQR_LXDH varchar2(15 BYTE),
     BKZT varchar2(2),
     DJSJ DATE               DEFAULT sysdate
 )TABLESPACE TBS_BIGDATA
@@ -39,23 +45,31 @@ CREATE TABLE XZXT.TB_ST_BKXX
 COMMENT ON table XZXT.TB_ST_BKXX is '布控信息表';
 COMMENT ON COLUMN XZXT.TB_ST_BKXX.XXZJBH IS '信息主键编号，主键';
 
-COMMENT ON COLUMN XZXT.TB_ST_BKXX.BKBSH IS '布控标识号';
+COMMENT ON COLUMN XZXT.TB_ST_BKXX.BKDXHM IS '布控对象号码';
 
-COMMENT ON COLUMN XZXT.TB_ST_BKXX.BSHLXDM IS '标识号类型代码';
+COMMENT ON COLUMN XZXT.TB_ST_BKXX.BKDXLX IS '布控对象类型';
 
-COMMENT ON COLUMN XZXT.TB_ST_BKXX.BSHLXMC IS '标识号类型名称';
+COMMENT ON COLUMN XZXT.TB_ST_BKXX.BKDXLXMC IS '布控对象类型名称';
+
+COMMENT ON COLUMN XZXT.TB_ST_BKXX.BKLX IS '布控类型 轨迹布控和关联关系布控';
+
+COMMENT ON COLUMN XZXT.TB_ST_BKXX.BKYJ IS '布控依据';
+
+COMMENT ON COLUMN XZXT.TB_ST_BKXX.BKYQ IS '布控要求';
 
 COMMENT ON COLUMN XZXT.TB_ST_BKXX.ASJBH IS '案事件编号';
 
-COMMENT ON COLUMN XZXT.TB_ST_BKXX.BKR_SFZH IS '布控人身份证号';
+COMMENT ON COLUMN XZXT.TB_ST_BKXX.SQR_SFZH IS '申请人身份证号';
+
+COMMENT ON COLUMN XZXT.TB_ST_BKXX.SQR_XM IS '申请人姓名';
 
-COMMENT ON COLUMN XZXT.TB_ST_BKXX.CBKR_XM IS '布控人姓名';
+COMMENT ON COLUMN XZXT.TB_ST_BKXX.SQR_JH IS '声请人警号';
 
-COMMENT ON COLUMN XZXT.TB_ST_BKXX.BKR_JH IS '布控人警号';
+COMMENT ON COLUMN XZXT.TB_ST_BKXX.SQR_LXDH IS '布控人联系电话';
 
-COMMENT ON COLUMN XZXT.TB_ST_BKXX.BKR_LXDH IS '布控人联系电话';
+COMMENT ON COLUMN XZXT.TB_ST_BKXX.BKSJ_START IS '布控时间_开始时间',
 
-COMMENT ON COLUMN XZXT.TB_ST_BKXX.BK_KSSJ IS '布控_开始时间',
+COMMENT ON COLUMN XZXT.TB_ST_BKXX.BKSJ_END IS '布控时间_结束时间',
 
 COMMENT ON COLUMN XZXT.TB_ST_BKXX.SPZT IS '布控状态，0正常，1停止';
 

src/main/resources/static/sql/S024.20190304_caopeng_新增时空班队结果显示二代证信息存储表.txt

+INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S024',0);
+INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S024',0);
+COMMIT;
+-------------------------------------------------------------------------------------------
+ALTER TABLE XZXT.TB_ST_TOGETHERRESULTDETAIL
+ DROP PRIMARY KEY CASCADE;
+
+DROP TABLE XZXT.TB_ST_TOGETHERRESULTDETAIL CASCADE CONSTRAINTS;
+
+CREATE TABLE XZXT.TB_ST_TOGETHERRESULTDETAIL
+(
+  XXZJBH            VARCHAR2(23 BYTE),
+  TASK_RESULT_ID    VARCHAR2(100 BYTE),
+  OBJECT_TYPE       VARCHAR2(10 BYTE),
+  OBJECT_TYPE_NAME  VARCHAR2(100 BYTE),
+  OBJECT_VALUE      VARCHAR2(50 BYTE),
+  BIRTHDAY          VARCHAR2(50 BYTE),
+  NAME              VARCHAR2(50 BYTE),
+  RYZP              BLOB,
+  XZZDZMC           VARCHAR2(100 BYTE),
+  CSDDZMC           VARCHAR2(100 BYTE),
+  ZJLX              VARCHAR2(50 BYTE),
+  ZJLX_CODE         VARCHAR2(50 BYTE),
+  ZJHM              VARCHAR2(50 BYTE),
+  SJHM              VARCHAR2(50 BYTE),
+  AGE               VARCHAR2(10 BYTE),
+  SEX               VARCHAR2(10 BYTE),
+  DJSJ              DATE DEFAULT sysdate
+)
+TABLESPACE TBS_BIGDATA
+PCTUSED    0
+PCTFREE    10
+INITRANS   1
+MAXTRANS   255
+STORAGE    (
+            INITIAL          64K
+            NEXT             1M
+            MINEXTENTS       1
+            MAXEXTENTS       UNLIMITED
+            PCTINCREASE      0
+            BUFFER_POOL      DEFAULT
+           )
+LOGGING
+NOCOMPRESS
+LOB (RYZP) STORE AS SECUREFILE
+      ( TABLESPACE  TBS_BIGDATA
+        ENABLE      STORAGE IN ROW
+        CHUNK       8192
+        NOCACHE
+        INDEX       (
+          TABLESPACE TBS_BIGDATA
+          STORAGE    (
+                      INITIAL          64K
+                      NEXT             1
+                      MINEXTENTS       1
+                      MAXEXTENTS       UNLIMITED
+                      PCTINCREASE      0
+                      BUFFER_POOL      DEFAULT
+                     ))
+        STORAGE    (
+                    INITIAL          104K
+                    NEXT             1M
+                    MINEXTENTS       1
+                    MAXEXTENTS       UNLIMITED
+                    PCTINCREASE      0
+                    BUFFER_POOL      DEFAULT
+                   )
+      )
+NOCACHE
+NOPARALLEL
+MONITORING;
+
+COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.XXZJBH IS '主键编号';
+
+COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.TASK_RESULT_ID IS '所属任务结果主键';
+
+COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.OBJECT_TYPE IS '对象类型';
+
+COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.OBJECT_TYPE_NAME IS '对象类型名称';
+
+COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.OBJECT_VALUE IS '对象值';
+
+COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.BIRTHDAY IS '出生日期';
+
+COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.NAME IS '姓名';
+
+COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.RYZP IS '人员照片';
+
+COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.XZZDZMC IS '现住址地点名称';
+
+COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.CSDDZMC IS '出生地地点名称';
+
+COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.ZJLX IS '证件类型';
+
+COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.ZJLX_CODE IS '证件类型编码';
+
+COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.ZJHM IS '证件号码';
+
+COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.SJHM IS '手机号码';
+
+COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.AGE IS '年龄';
+
+COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.SEX IS '性别';
+
+COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.DJSJ IS '登记时间';
+
+
+
+CREATE UNIQUE INDEX XZXT.PK_TOGETHERDETAIL_XXZJBH ON XZXT.TB_ST_TOGETHERRESULTDETAIL
+(XXZJBH)
+LOGGING
+TABLESPACE TBS_BIGDATA
+PCTFREE    10
+INITRANS   2
+MAXTRANS   255
+STORAGE    (
+            INITIAL          64K
+            NEXT             1M
+            MINEXTENTS       1
+            MAXEXTENTS       UNLIMITED
+            PCTINCREASE      0
+            BUFFER_POOL      DEFAULT
+           )
+NOPARALLEL;
+
+
+ALTER TABLE XZXT.TB_ST_TOGETHERRESULTDETAIL ADD (
+  CONSTRAINT PK_TOGETHERDETAIL_XXZJBH
+ PRIMARY KEY
+ (XXZJBH)
+    USING INDEX
+    TABLESPACE TBS_BIGDATA
+    PCTFREE    10
+    INITRANS   2
+    MAXTRANS   255
+    STORAGE    (
+                INITIAL          64K
+                NEXT             1M
+                MINEXTENTS       1
+                MAXEXTENTS       UNLIMITED
+                PCTINCREASE      0
+               ));
+
+
+
+-------------------------------------------------------------------------------------------
+UPDATE XZXT.SYS_DBLOG SET STATUS=1 WHERE SID='S024';
+COMMIT;
\ No newline at end of file

src/main/resources/static/sql/S025.20190304_caopeng_给REGIONALTASKRESULTDETAIL表添加登记时间字段.txt

+INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S025',0);
+INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S025',0);
+COMMIT;
+-------------------------------------------------------------------------------------------
+
+ALTER TABLE XZXT.REGIONALTASKRESULTDETAIL
+ ADD (DJSJ  DATE                                    DEFAULT SYSDATE);
+COMMENT ON COLUMN XZXT.REGIONALTASKRESULTDETAIL.DJSJ IS '登记时间';
+
+-------------------------------------------------------------------------------------------
+UPDATE XZXT.SYS_DBLOG SET STATUS=1 WHERE SID='S025';
+COMMIT;
\ No newline at end of file

src/main/resources/static/sql/S026.20190307_chentian_布控信息表增加字段以及修改字段长度.txt

+INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S026',0);
+INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S026',0);
+COMMIT;
+-------------------------------------------------------------------------------------------
+
+-- Add/modify columns
+alter table TB_ST_BKXX add BKQX VARCHAR2(100);
+-- Add comments to the columns
+comment on column TB_ST_BKXX.BKQX
+  is '布控期限';
+
+ alter table TB_ST_BKXX modify(XXZJBH varchar2(32));
+
+-------------------------------------------------------------------------------------------
+UPDATE XZXT.SYS_DBLOG SET STATUS=1 WHERE SID='S026';
+COMMIT;
\ No newline at end of file

src/main/resources/templates/标识号代码.properties

-\u624B\u673A\u53F7\u7801=001
+\u624B\u673A\u53F7\u7801=001
 \u624B\u673A\u53F7\u7801=001
 QQ\u53F7\u7801=002
 \u5FAE\u4FE1ID=003
+\u5FAE\u4FE1\u53F7\u7801=009
 \u8EAB\u4EFD\u8BC1\u53F7=004
 \u8F66\u724C\u53F7=005
 IMSI=006