Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/yxproject/start/api/FailedCardApi.java

@@ -81,8 +81,6 @@ public class FailedCardApi {
         return resultList;
     }
 
-
-
     /**
      * 生成余证(每个余证生成一个任务单)
      * @param jsonStr
@@ -140,36 +138,40 @@ public class FailedCardApi {
     @RequestMapping("insertBackCard")
     @Transactional(rollbackFor = Exception.class)
     public boolean insertBackCard(@RequestBody String jsonStr){
-        JSONArray jsonarray = JSONArray.fromObject(jsonStr);
-        TaskEntity taskEntity = new TaskEntity();
-        String str2 = null;
-        for (int i = 0; i < jsonarray.size(); i++) {
-            JSONObject jsonObject = (JSONObject) jsonarray.get(i);
-            String str = jsonObject.getString("idCard");
-            if (i != jsonarray.size() - 1) {
-                str2 += "'" + str + "',";
-            } else {
-                str2 += "'" + str + "'";
+        try {
+            JSONArray jsonarray = JSONArray.fromObject(jsonStr);
+            TaskEntity taskEntity = new TaskEntity();
+            String str2 = null;
+            for (int i = 0; i < jsonarray.size(); i++) {
+                JSONObject jsonObject = (JSONObject) jsonarray.get(i);
+                String str = jsonObject.getString("idCard");
+                if (i != jsonarray.size() - 1) {
+                    str2 += "'" + str + "',";
+                } else {
+                    str2 += "'" + str + "'";
+                }
             }
-        }
-        //查询制证库，拿到组号列表
-        List<String> groupList = failedCardService.selectGroupNo(str2);
-        //生成任务单
-        for (int i = 0; i < groupList.size(); i++) {
-            JSONObject jsonObject = (JSONObject) jsonarray.get(i);
-            //查询生成任务单需要的数据
-            Map<String, Object> dataMap = failedCardService.selectTaskListById(jsonObject.getString("idCard"));
-            //TODO 会报空指针异常
-            String countyCode = dataMap.get("COUNTY_CODE").toString();
-            Long cardType = (Long) dataMap.get("CARD_TYPE_ID");
-            taskEntity.setCountyCode(countyCode);
-            taskEntity.setCardType(cardType);
-            taskEntity.setTaskStateId((long) 1);
+            //查询制证库，拿到组号列表
+            List<String> groupList = failedCardService.selectGroupNo(str2);
             //生成任务单
-            taskListService.saveTask(taskEntity);
-            //生成新组号列表
-           Map<String,Object> groupDataMap= failedCardService.selectGroupDate(groupList.get(i));
-           failedCardService.insertGroupNo(String.valueOf(groupDataMap.get("GROUP_NO")),String.valueOf(groupDataMap.get("TASK_ID")),(Long) groupDataMap.get("VALID_COUNT"),(Long)groupDataMap.get("INVALID_COUNT"));
+            for (int i = 0; i < groupList.size(); i++) {
+                JSONObject jsonObject = (JSONObject) jsonarray.get(i);
+                //查询生成任务单需要的数据
+                Map<String, Object> dataMap = failedCardService.selectTaskListById(jsonObject.getString("idCard"));
+                //TODO 会报空指针异常
+                String countyCode = dataMap.get("COUNTY_CODE").toString();
+                Long cardType = (Long) dataMap.get("CARD_TYPE_ID");
+                taskEntity.setCountyCode(countyCode);
+                taskEntity.setCardType(cardType);
+                taskEntity.setTaskStateId((long) 1);
+                //生成任务单
+                taskListService.saveTask(taskEntity);
+                //生成新组号列表
+                Map<String, Object> groupDataMap = failedCardService.selectGroupDate(groupList.get(i));
+                failedCardService.insertGroupNo(String.valueOf(groupDataMap.get("GROUP_NO")), String.valueOf(groupDataMap.get("TASK_ID")), (Long) groupDataMap.get("VALID_COUNT"), (Long) groupDataMap.get("INVALID_COUNT"));
+            }
+        } catch (NullPointerException e) {
+            return false;
         }
         return true;
     }

src/main/java/com/yxproject/start/api/LogApi.java

@@ -114,14 +114,17 @@ public class LogApi {
 
     /**
      * 删除制证包及其数据
-     * @param fileId
+     * @param uploadTime
      * @return true
      */
      @RequestMapping("deleteFiles")
      @Transactional(rollbackFor = Exception.class)
-     public boolean deleteFiles(@RequestParam("fileId")String fileId){
-         logService.deleteFilesData(fileId);
-         logService.deleteFile(fileId);
+     public boolean deleteFiles(@RequestParam("uploadTime")String uploadTime){
+         List<String> idList =logService.selectId(uploadTime);
+         for (int i=0;i<idList.size();i++){
+             logService.deleteFilesData(idList.get(i));
+             logService.deleteFile(idList.get(i));
+         }
          return true;
      }
 

src/main/java/com/yxproject/start/mapper/LogMapper.java

@@ -136,11 +136,14 @@ public interface LogMapper {
 
 
 
-    @Delete("delete from PREPRO_PERSON where file_id = #{fileId}")
-    public boolean deleteFilesData(@Param("fileId")String fileId);
+    @Select("select id  from files where TO_CHAR(UPLOAD_DATE,'yyyy-mm-dd hh24:mi:ss') = #{uploadTime}")
+    public List<String> selectId(@Param("uploadTime")String uploadTime);
 
-    @Delete("delete from files where id=#{fileId}")
-    public boolean deleteFile(@Param("fileId")String fileId);
+    @Delete("delete from PREPRO_PERSON where PREPRO_PERSON.sid = #{id}")
+    public boolean deleteFilesData(@Param("uploadTime")String id);
+
+    @Delete("delete from files where id=#{id}")
+    public boolean deleteFile(@Param("uploadTime")String id);
 
 
 

src/main/java/com/yxproject/start/service/LogService.java

@@ -25,7 +25,9 @@ public interface LogService {
     public boolean insertAnalysisDate(String printDate,String latticeMouthInformation);
 
 
-    public boolean deleteFilesData(@Param("fileId")String fileId);
+    public boolean deleteFilesData(@Param("id")String id);
 
-    public boolean deleteFile(@Param("fileId")String fileId);
+    public boolean deleteFile(@Param("id")String id);
+
+    public List<String> selectId(@Param("uploadTime")String uploadTime);
 }

src/main/java/com/yxproject/start/service/impl/LogServiceImpl.java

@@ -63,14 +63,20 @@ public class LogServiceImpl implements LogService {
     }
 
     @Override
-    public boolean deleteFilesData(String fileId) {
-        logMapper.deleteFilesData(fileId);
+    public boolean deleteFilesData(String id) {
+        logMapper.deleteFilesData(id);
         return true;
     }
 
     @Override
-    public boolean deleteFile(String fileId) {
-        logMapper.deleteFile(fileId);
+    public boolean deleteFile(String id) {
+        logMapper.deleteFile(id);
         return true;
     }
+
+    @Override
+    public List<String> selectId(String uploadTime) {
+       List<String> id= logMapper.selectId(uploadTime);
+        return id;
+    }
 }

src/main/resources/static/js/service.js

@@ -662,13 +662,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
-            analyseData:function(id,success){
-                console.log(id)
+            analyseData:function(date,success){
+                console.log(date)
                 $http({
                     method: 'GET',
                     url: "../LogApi/selectAnalysisData"+urlTimeStamp(),
                     params:{
-                        filesId:id
+                        uploadDate:date
                     }
                 }).then(function successCallback(response) {
                     success(response.data)
@@ -796,13 +796,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
-            deleteProdDataByFileId:function(id,success){
-                console.log(id)
+            deleteProdDataByFileId:function(uploadDate,success){
+                console.log(uploadDate)
                 $http({
                     method: 'GET',
                     url: "../LogApi/deleteFiles"+urlTimeStamp(),
                     params:{
-                        fileId:id
+                        uploadTime:uploadDate
                     }
                 }).then(function successCallback(response) {
                     success(response.data)

src/main/resources/static/views/xmlAndSearch/xmlAndSearch.html

@@ -88,8 +88,8 @@
                         <td>{{item.commonCount}}</td>
                         <td>{{item.postCount}}</td>
                         <td>
-                            <button class="btn btn-primary" ng-click="analysis(item.uploadDate,item.packageCount,item.fileId)">解析</button>
-                            <button class="btn btn-danger" ng-click="deleteDataById(item.uploadDate,item.packageCount,item.fileId)">删除</button>
+                            <button class="btn btn-primary" ng-click="analysis(item.date,item.packageCount)">解析</button>
+                            <button class="btn btn-danger" ng-click="deleteDataById(item.date,item.packageCount)">删除</button>
                         </td>
                     </tr>
                     </tbody>

src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js

@@ -32,7 +32,7 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
 
 
 
-        $scope.analysis = function (uploadDate,packageCount,id) {
+        $scope.analysis = function (uploadDate,packageCount) {
             ngDialog.open({
                 template: 'dialogs/analysisDialog.html' + urlTimeStamp(),
                 width: 876,
@@ -40,7 +40,7 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
                 controller: ['$scope','HttpService', function ($scope,HttpService) {
                     $scope.upDate =uploadDate;
                     $scope.upCount=packageCount;
-                    HttpService.analyseData(id, function (data) {
+                    HttpService.analyseData(uploadDate, function (data) {
                         $scope.resultData = data;
                         console.log($scope.resultData)
                     })
@@ -87,7 +87,7 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
 
 
         var reGet = $scope.getXmlPackage;
-        $scope.deleteDataById = function(uploadDate,packageCount,id){
+        $scope.deleteDataById = function(uploadDate,packageCount){
             ngDialog.open({
                 template: 'dialogs/confirm.html' + urlTimeStamp(),
                 width: 600,
@@ -97,7 +97,7 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
                     $scope.total = packageCount;
                     $scope.importDate =uploadDate;
                     $scope.confirmDelete = function () {
-                        HttpService.deleteProdDataByFileId(id, function (data) {
+                        HttpService.deleteProdDataByFileId(uploadDate, function (data) {
                             MessageService.showAlert(data.msg);
                             $scope.closeThisDialog();
                             reGet();