修改更新参数模版接口

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java

@@ -128,8 +128,8 @@ public class SysUserController {
      * @return
      */
     @ApiOperation(value = "用户管理-分页查询")
-    @RequiresPermissions("sys:user:list")
+//    @RequiresPermissions("sys:user:list")
-    @PermissionData(pageComponent = "system/UserList")
+//    @PermissionData(pageComponent = "system/UserList")
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     public Result<IPage<SysUser>> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java

@@ -226,6 +226,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
                         target.setControlValues(source.getControlValues());
                         target.setControlVerify(source.getControlVerify());
                         target.setFileTemplateConnectId(source.getFileTemplateConnectId());
+                        break;
                     }
                 }
                 if(!isHave){
@@ -248,6 +249,21 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
                 }
             }
             paramsCollectManifestEOService.saveOrUpdateBatch(paramsCollectManifestEOList);
+
+            List<String> delList = new ArrayList<>();
+            for (ParamsCollectManifestEO target : paramsCollectManifestEOList) {
+                boolean isHave = false;
+                for (ParamsInfoPublishEO source : paramsInfoPublishEOList) {
+                    if (target.getNioNumber().equals(source.getNioNumber())) {
+                        isHave = true;
+                        break;
+                    }
+                }
+                if(!isHave){
+                    delList.add(target.getId());
+                }
+            }
+            paramsCollectManifestEOService.deleteByIds(delList);
         }catch (Exception e){
             e.printStackTrace();
             return false;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java

@@ -41,7 +41,7 @@ import java.util.Map;
  */
 @Api(tags="项目库基础表")
 @RestController
-@RequestMapping("/project/projectLibraryBase")
+@RequestMapping("/已同步生产环境braryBase")
 @Slf4j
 public class ProjectLibraryBaseController extends JeroController<ProjectLibraryBase, IProjectLibraryBaseService> {
 	@Autowired

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java

@@ -259,6 +259,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		String projectId = UUID.randomUUID().toString().replace("-", "");
 		//主表中添加数据
 		ProjectLibraryBase projectLibraryBaseTemp = this.getById(id);
+		projectLibraryBaseTemp.setCreateBy(null);
+		projectLibraryBaseTemp.setCreateTime(null);
+		projectLibraryBaseTemp.setUpdateBy(null);
+		projectLibraryBaseTemp.setUpdateTime(null);
 		projectLibraryBaseTemp.setId(projectId);
 		projectLibraryBaseTemp.setParentId(id);
 		projectLibraryBaseTemp.setProjectVersion(projectLibraryBase.getProjectVersion());