项目管理功能接口

-package com.skua.modules.safe.controller;
+package com.skua.modules.project.controller;
 
 
 import java.util.Arrays;
 import java.util.Arrays;
 import java.util.List;
 import java.util.List;
@@ -12,8 +12,8 @@ import com.skua.core.api.vo.Result;
 import com.skua.core.aspect.annotation.AutoLog;
 import com.skua.core.aspect.annotation.AutoLog;
 import com.skua.core.query.QueryGenerator;
 import com.skua.core.query.QueryGenerator;
 import com.skua.core.util.ConvertUtils;
 import com.skua.core.util.ConvertUtils;
-import com.skua.modules.safe.entity.SysSafeArea;
-import com.skua.modules.safe.service.ISysSafeAreaService;
+import com.skua.modules.project.entity.FmProject;
+import com.skua.modules.project.service.IFmProjectService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -35,35 +35,35 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 
 
  /**
  /**
- * 安全风险区域管理
+ * 数字孪生项目管理
  */
  */
 @Slf4j
 @Slf4j
-@Api(tags="安全风险区域管理")
+@Api(tags="数字孪生项目管理")
 @RestController
 @RestController
-@RequestMapping("/safe/sysSafeArea")
-public class SysSafeAreaController {
+@RequestMapping("/project/fmProject")
+public class FmProjectController {
 	@Autowired
 	@Autowired
-	private ISysSafeAreaService sysSafeAreaService;
+	private IFmProjectService fmProjectService;
 	
 	
 	/**
 	/**
 	  * 分页列表查询
 	  * 分页列表查询
-	 * @param sysSafeArea
+	 * @param fmProject
 	 * @param pageNo
 	 * @param pageNo
 	 * @param pageSize
 	 * @param pageSize
 	 * @param req
 	 * @param req
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "安全风险区域管理-分页列表查询")
-	@ApiOperation(value="安全风险区域管理-分页列表查询", notes="安全风险区域管理-分页列表查询")
+	@AutoLog(value = "数字孪生项目管理-分页列表查询")
+	@ApiOperation(value="数字孪生项目管理-分页列表查询", notes="数字孪生项目管理-分页列表查询")
 	@GetMapping(value = "/list")
 	@GetMapping(value = "/list")
-	public Result<IPage<SysSafeArea>> queryPageList(SysSafeArea sysSafeArea,
+	public Result<IPage<FmProject>> queryPageList(FmProject fmProject,
 									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									  HttpServletRequest req) {
 									  HttpServletRequest req) {
-		Result<IPage<SysSafeArea>> result = new Result<IPage<SysSafeArea>>();
-		QueryWrapper<SysSafeArea> queryWrapper = QueryGenerator.initQueryWrapper(sysSafeArea, req.getParameterMap());
-		Page<SysSafeArea> page = new Page<SysSafeArea>(pageNo, pageSize);
-		IPage<SysSafeArea> pageList = sysSafeAreaService.page(page, queryWrapper);
+		Result<IPage<FmProject>> result = new Result<IPage<FmProject>>();
+		QueryWrapper<FmProject> queryWrapper = QueryGenerator.initQueryWrapper(fmProject, req.getParameterMap());
+		Page<FmProject> page = new Page<FmProject>(pageNo, pageSize);
+		IPage<FmProject> pageList = fmProjectService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setSuccess(true);
 		result.setResult(pageList);
 		result.setResult(pageList);
 		return result;
 		return result;
@@ -71,16 +71,16 @@ public class SysSafeAreaController {
 	
 	
 	/**
 	/**
 	  *   添加
 	  *   添加
-	 * @param sysSafeArea
+	 * @param fmProject
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "安全风险区域管理-添加")
-	@ApiOperation(value="安全风险区域管理-添加", notes="安全风险区域管理-添加")
+	@AutoLog(value = "数字孪生项目管理-添加")
+	@ApiOperation(value="数字孪生项目管理-添加", notes="数字孪生项目管理-添加")
 	@PostMapping(value = "/add")
 	@PostMapping(value = "/add")
-	public Result<SysSafeArea> add(@RequestBody SysSafeArea sysSafeArea) {
-		Result<SysSafeArea> result = new Result<SysSafeArea>();
+	public Result<FmProject> add(@RequestBody FmProject fmProject) {
+		Result<FmProject> result = new Result<FmProject>();
 		try {
 		try {
-			sysSafeAreaService.save(sysSafeArea);
+			fmProjectService.save(fmProject);
 			result.success("添加成功！");
 			result.success("添加成功！");
 		} catch (Exception e) {
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
 			log.error(e.getMessage(),e);
@@ -91,19 +91,19 @@ public class SysSafeAreaController {
 	
 	
 	/**
 	/**
 	  *  编辑
 	  *  编辑
-	 * @param sysSafeArea
+	 * @param fmProject
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "安全风险区域管理-编辑")
-	@ApiOperation(value="安全风险区域管理-编辑", notes="安全风险区域管理-编辑")
+	@AutoLog(value = "数字孪生项目管理-编辑")
+	@ApiOperation(value="数字孪生项目管理-编辑", notes="数字孪生项目管理-编辑")
 	@PutMapping(value = "/edit")
 	@PutMapping(value = "/edit")
-	public Result<SysSafeArea> edit(@RequestBody SysSafeArea sysSafeArea) {
-		Result<SysSafeArea> result = new Result<SysSafeArea>();
-		SysSafeArea sysSafeAreaEntity = sysSafeAreaService.getById(sysSafeArea.getId());
-		if(sysSafeAreaEntity==null) {
+	public Result<FmProject> edit(@RequestBody FmProject fmProject) {
+		Result<FmProject> result = new Result<FmProject>();
+		FmProject fmProjectEntity = fmProjectService.getById(fmProject.getId());
+		if(fmProjectEntity==null) {
 			result.error500("未找到对应实体");
 			result.error500("未找到对应实体");
 		}else {
 		}else {
-			boolean ok = sysSafeAreaService.updateById(sysSafeArea);
+			boolean ok = fmProjectService.updateById(fmProject);
 			//TODO 返回false说明什么？
 			//TODO 返回false说明什么？
 			if(ok) {
 			if(ok) {
 				result.success("修改成功!");
 				result.success("修改成功!");
@@ -118,12 +118,12 @@ public class SysSafeAreaController {
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "安全风险区域管理-通过id删除")
-	@ApiOperation(value="安全风险区域管理-通过id删除", notes="安全风险区域管理-通过id删除")
+	@AutoLog(value = "数字孪生项目管理-通过id删除")
+	@ApiOperation(value="数字孪生项目管理-通过id删除", notes="数字孪生项目管理-通过id删除")
 	@DeleteMapping(value = "/delete")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		try {
 		try {
-			sysSafeAreaService.removeById(id);
+			fmProjectService.removeById(id);
 		} catch (Exception e) {
 		} catch (Exception e) {
 			log.error("删除失败",e.getMessage());
 			log.error("删除失败",e.getMessage());
 			return Result.error("删除失败!");
 			return Result.error("删除失败!");
@@ -136,15 +136,15 @@ public class SysSafeAreaController {
 	 * @param ids
 	 * @param ids
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "安全风险区域管理-批量删除")
-	@ApiOperation(value="安全风险区域管理-批量删除", notes="安全风险区域管理-批量删除")
+	@AutoLog(value = "数字孪生项目管理-批量删除")
+	@ApiOperation(value="数字孪生项目管理-批量删除", notes="数字孪生项目管理-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
-	public Result<SysSafeArea> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<SysSafeArea> result = new Result<SysSafeArea>();
+	public Result<FmProject> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<FmProject> result = new Result<FmProject>();
 		if(ids==null || "".equals(ids.trim())) {
 		if(ids==null || "".equals(ids.trim())) {
 			result.error500("参数不识别！");
 			result.error500("参数不识别！");
 		}else {
 		}else {
-			this.sysSafeAreaService.removeByIds(Arrays.asList(ids.split(",")));
+			this.fmProjectService.removeByIds(Arrays.asList(ids.split(",")));
 			result.success("删除成功!");
 			result.success("删除成功!");
 		}
 		}
 		return result;
 		return result;
@@ -155,16 +155,16 @@ public class SysSafeAreaController {
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "安全风险区域管理-通过id查询")
-	@ApiOperation(value="安全风险区域管理-通过id查询", notes="安全风险区域管理-通过id查询")
+	@AutoLog(value = "数字孪生项目管理-通过id查询")
+	@ApiOperation(value="数字孪生项目管理-通过id查询", notes="数字孪生项目管理-通过id查询")
 	@GetMapping(value = "/queryById")
 	@GetMapping(value = "/queryById")
-	public Result<SysSafeArea> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<SysSafeArea> result = new Result<SysSafeArea>();
-		SysSafeArea sysSafeArea = sysSafeAreaService.getById(id);
-		if(sysSafeArea==null) {
+	public Result<FmProject> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<FmProject> result = new Result<FmProject>();
+		FmProject fmProject = fmProjectService.getById(id);
+		if(fmProject==null) {
 			result.error500("未找到对应实体");
 			result.error500("未找到对应实体");
 		}else {
 		}else {
-			result.setResult(sysSafeArea);
+			result.setResult(fmProject);
 			result.setSuccess(true);
 			result.setSuccess(true);
 		}
 		}
 		return result;
 		return result;
@@ -179,13 +179,13 @@ public class SysSafeAreaController {
   @RequestMapping(value = "/exportXls")
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
   public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
       // Step.1 组装查询条件
       // Step.1 组装查询条件
-      QueryWrapper<SysSafeArea> queryWrapper = null;
+      QueryWrapper<FmProject> queryWrapper = null;
       try {
       try {
           String paramsStr = request.getParameter("paramsStr");
           String paramsStr = request.getParameter("paramsStr");
           if (ConvertUtils.isNotEmpty(paramsStr)) {
           if (ConvertUtils.isNotEmpty(paramsStr)) {
               String deString = URLDecoder.decode(paramsStr, "UTF-8");
               String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              SysSafeArea sysSafeArea = JSON.parseObject(deString, SysSafeArea.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(sysSafeArea, request.getParameterMap());
+              FmProject fmProject = JSON.parseObject(deString, FmProject.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(fmProject, request.getParameterMap());
           }
           }
       } catch (UnsupportedEncodingException e) {
       } catch (UnsupportedEncodingException e) {
           e.printStackTrace();
           e.printStackTrace();
@@ -193,11 +193,11 @@ public class SysSafeAreaController {
 
 
       //Step.2 AutoPoi 导出Excel
       //Step.2 AutoPoi 导出Excel
       ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
       ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<SysSafeArea> pageList = sysSafeAreaService.list(queryWrapper);
+      List<FmProject> pageList = fmProjectService.list(queryWrapper);
       //导出文件名称
       //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "安全风险区域管理列表");
-      mv.addObject(NormalExcelConstants.CLASS, SysSafeArea.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("安全风险区域管理列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.FILE_NAME, "数字孪生项目管理列表");
+      mv.addObject(NormalExcelConstants.CLASS, FmProject.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("数字孪生项目管理列表数据", "导出人:Jeecg", "导出信息"));
       mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
       mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
       return mv;
       return mv;
   }
   }
@@ -220,9 +220,9 @@ public class SysSafeAreaController {
           params.setHeadRows(1);
           params.setHeadRows(1);
           params.setNeedSave(true);
           params.setNeedSave(true);
           try {
           try {
-              List<SysSafeArea> listSysSafeAreas = ExcelImportUtil.importExcel(file.getInputStream(), SysSafeArea.class, params);
-              sysSafeAreaService.saveBatch(listSysSafeAreas);
-              return Result.ok("文件导入成功！数据行数:" + listSysSafeAreas.size());
+              List<FmProject> listFmProjects = ExcelImportUtil.importExcel(file.getInputStream(), FmProject.class, params);
+              fmProjectService.saveBatch(listFmProjects);
+              return Result.ok("文件导入成功！数据行数:" + listFmProjects.size());
           } catch (Exception e) {
           } catch (Exception e) {
               log.error(e.getMessage(),e);
               log.error(e.getMessage(),e);
               return Result.error("文件导入失败:"+e.getMessage());
               return Result.error("文件导入失败:"+e.getMessage());

+package com.skua.modules.project.controller;
+
+import com.skua.core.api.vo.Result;
+import com.skua.core.aspect.annotation.AutoLog;
+import com.skua.modules.project.entity.FmProject;
+import com.skua.modules.project.service.IProjectService;
+import com.skua.modules.project.vo.FmProjectVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
+/**
+* 数字孪生项目管理
+*/
+@Slf4j
+@Api(tags="数字孪生项目管理")
+@RestController
+@RequestMapping("/3d/project")
+public class ProjectController {
+   @Autowired
+   private IProjectService projectService;
+
+   /**
+     * 列表查询
+    * @return
+    */
+   @AutoLog(value = "数字孪生项目管理列表查询")
+   @ApiOperation(value="数字孪生项目管理列表查询", notes="数字孪生项目管理列表查询")
+   @GetMapping(value = "/list")
+   public Result<List<FmProjectVO>> queryList() {
+       Result<List<FmProjectVO>> result = new Result<List<FmProjectVO>>();
+       List<FmProjectVO> pageList = projectService.queryList();
+       result.setSuccess(true);
+       result.setResult(pageList);
+       return result;
+   }
+
+}

-package com.skua.modules.safe.entity;
+package com.skua.modules.project.entity;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Date;
@@ -16,59 +16,31 @@ import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 
 /**
 /**
- * 安全风险区域管理
+ * 数字孪生项目管理
  */
  */
 @Data
 @Data
-@TableName("sys_safe_area")
+@TableName("fm_project")
 @EqualsAndHashCode(callSuper = false)
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @Accessors(chain = true)
-@ApiModel(value="sys_safe_area对象", description="安全风险区域管理")
-public class SysSafeArea {
+@ApiModel(value="fm_project对象", description="数字孪生项目管理")
+public class FmProject {
     
     
 	/**主键id*/
 	/**主键id*/
 	@TableId(type = IdType.UUID)
 	@TableId(type = IdType.UUID)
     @ApiModelProperty(value = "主键id")
     @ApiModelProperty(value = "主键id")
-	private java.lang.Integer id;
-	/**区间id*/
-	@Excel(name = "区间id", width = 15)
-    @ApiModelProperty(value = "区间id")
-	private java.lang.String structId;
-	/**区间名称*/
-	@Excel(name = "区间名称", width = 15)
-    @ApiModelProperty(value = "区间名称")
-	private java.lang.String structName;
-	/**现场风险辨识*/
-	@Excel(name = "现场风险辨识", width = 15)
-    @ApiModelProperty(value = "现场风险辨识")
-	private java.lang.String safeDanger;
-	/**应急处置措施*/
-	@Excel(name = "应急处置措施", width = 15)
-    @ApiModelProperty(value = "应急处置措施")
-	private java.lang.String safeMeasures;
-	/**人的要求*/
-	@Excel(name = "人的要求", width = 15)
-    @ApiModelProperty(value = "人的要求")
-	private java.lang.String safePerson;
-	/**机械的要求*/
-	@Excel(name = "机械的要求", width = 15)
-    @ApiModelProperty(value = "机械的要求")
-	private java.lang.String safeEquip;
-	/**产品物料*/
-	@Excel(name = "产品物料", width = 15)
-    @ApiModelProperty(value = "产品物料")
-	private java.lang.String safeMaterial;
-	/**操作要点*/
-	@Excel(name = "操作要点", width = 15)
-    @ApiModelProperty(value = "操作要点")
-	private java.lang.String safeOperation;
-	/**作业环境*/
-	@Excel(name = "作业环境", width = 15)
-    @ApiModelProperty(value = "作业环境")
-	private java.lang.String safeEnvironment;
-	/**所属厂区*/
-	@Excel(name = "所属厂区", width = 15)
-	@ApiModelProperty(value = "所属厂区")
-	private java.lang.String factoryId;
+	private java.lang.String id;
+	/**项目编码*/
+	@Excel(name = "项目编码", width = 15)
+    @ApiModelProperty(value = "项目编码")
+	private java.lang.String projectId;
+	/**项目名称*/
+	@Excel(name = "项目名称", width = 15)
+    @ApiModelProperty(value = "项目名称")
+	private java.lang.String projectName;
+	/**描述*/
+	@Excel(name = "描述", width = 15)
+    @ApiModelProperty(value = "描述")
+	private java.lang.String remark;
 	/**创建人*/
 	/**创建人*/
 	@Excel(name = "创建人", width = 15)
 	@Excel(name = "创建人", width = 15)
     @ApiModelProperty(value = "创建人")
     @ApiModelProperty(value = "创建人")
@@ -89,8 +61,8 @@ public class SysSafeArea {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     @ApiModelProperty(value = "更新时间")
 	private java.util.Date updateTime;
 	private java.util.Date updateTime;
-	/**标识*/
-	@Excel(name = "标识", width = 15)
-    @ApiModelProperty(value = "标识")
-	private java.lang.Integer delFlag;
+	/**删除标识*/
+	@Excel(name = "删除标识", width = 15)
+    @ApiModelProperty(value = "删除标识")
+	private java.lang.String delFlag;
 }
 }

-package com.skua.modules.safe.mapper;
+package com.skua.modules.project.mapper;
 
 
 import java.util.List;
 import java.util.List;
 
 
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
-import com.skua.modules.safe.entity.SysSafeArea;
+import com.skua.modules.project.entity.FmProject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**
 /**
- * 安全风险区域管理
+ * 数字孪生项目管理
  */
  */
-public interface SysSafeAreaMapper extends BaseMapper<SysSafeArea> {
+public interface FmProjectMapper extends BaseMapper<FmProject> {
 
 
+    List<FmProject> queryList();
 }
 }

 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.skua.modules.safe.mapper.SysSafeAreaMapper">
+<mapper namespace="com.skua.modules.project.mapper.FmProjectMapper">
+
+    <select id="queryList" resultType="com.skua.modules.project.entity.FmProject">
+        select * from fm_project order by project_id
+    </select>
 
 
 </mapper>
 </mapper>
\ No newline at end of file

+package com.skua.modules.project.service;
+
+import com.skua.modules.project.entity.FmProject;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 数字孪生项目管理
+ */
+public interface IFmProjectService extends IService<FmProject> {
+
+}

+package com.skua.modules.project.service;
+
+import com.skua.modules.project.vo.FmProjectVO;
+
+import java.util.List;
+
+/**
+ * 数字孪生项目管理
+ */
+public interface IProjectService {
+
+    List<FmProjectVO> queryList();
+}

+package com.skua.modules.project.service.impl;
+
+import com.skua.modules.project.entity.FmProject;
+import com.skua.modules.project.mapper.FmProjectMapper;
+import com.skua.modules.project.service.IFmProjectService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 数字孪生项目管理
+ */
+@Service
+public class FmProjectServiceImpl extends ServiceImpl<FmProjectMapper, FmProject> implements IFmProjectService {
+
+}

+package com.skua.modules.project.service.impl;
+
+import com.skua.modules.project.entity.FmProject;
+import com.skua.modules.project.mapper.FmProjectMapper;
+import com.skua.modules.project.service.IProjectService;
+import com.skua.modules.project.vo.FmProjectVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 数字孪生项目管理
+ */
+@Service
+public class ProjectServiceImpl implements IProjectService {
+
+    @Autowired
+    private FmProjectMapper fmProjectMapper;
+
+    @Override
+    public List<FmProjectVO> queryList() {
+        List<FmProjectVO> list = new ArrayList<>();
+        List<FmProject> reslist = new ArrayList<>();
+        reslist = fmProjectMapper.queryList();
+        for (FmProject fmProject : reslist ) {
+            FmProjectVO fmProjectVO = new FmProjectVO();
+            fmProjectVO.setProjectId(fmProject.getProjectId());
+            fmProjectVO.setProjectName(fmProject.getProjectName());
+            list.add(fmProjectVO);
+        }
+        return list;
+    }
+}

+package com.skua.modules.project.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 数字孪生项目管理
+ */
+@Data
+public class FmProjectVO {
+    
+	/**项目编码*/
+	private String projectId;
+	/**项目名称*/
+	private String projectName;
+
+}

@@ -25,7 +25,5 @@ public interface ISysMonthDataService extends IService<SysMonthData> {
 
 
     List<ResultDataVO> getMonthlyDataTotal(String factoryId, String month);
     List<ResultDataVO> getMonthlyDataTotal(String factoryId, String month);
 
 
-    Map<String, Object> getDigitalSignageInfo(String factoryId, String structId);
-
     Map<String, Object> getDigitalSignageData(String factoryId, String structId);
     Map<String, Object> getDigitalSignageData(String factoryId, String structId);
 }
 }

@@ -10,8 +10,6 @@ import com.skua.modules.monitor.service.ISysMonthDataService;
 import com.skua.modules.remote.service.ISysMonitorDataService;
 import com.skua.modules.remote.service.ISysMonitorDataService;
 import com.skua.modules.remote.service.ISysMonitorLocationService;
 import com.skua.modules.remote.service.ISysMonitorLocationService;
 import com.skua.modules.remote.vo.MonitorLocationVO;
 import com.skua.modules.remote.vo.MonitorLocationVO;
-import com.skua.modules.safe.entity.SysSafeArea;
-import com.skua.modules.safe.service.ISysSafeAreaService;
 import com.skua.modules.system.datestandard.entity.SysStructDict;
 import com.skua.modules.system.datestandard.entity.SysStructDict;
 import com.skua.modules.system.datestandard.mapper.SysStructDictMapper;
 import com.skua.modules.system.datestandard.mapper.SysStructDictMapper;
 import com.skua.modules.system.vo.ResultDataVO;
 import com.skua.modules.system.vo.ResultDataVO;
@@ -38,15 +36,9 @@ public class SysMonthDataServiceImpl extends ServiceImpl<SysMonthDataMapper, Sys
     @Resource
     @Resource
     private SysMonthDataMapper sysMonthDataMapper;
     private SysMonthDataMapper sysMonthDataMapper;
     @Autowired
     @Autowired
-    private SysStructDictMapper sysStructDictMapper;
-    @Autowired
-    private SysEquipInfoMapper sysEquipInfoMapper;
-    @Autowired
     private ISysMonitorLocationService sysMonitorLocationService;
     private ISysMonitorLocationService sysMonitorLocationService;
     @Autowired
     @Autowired
     private ISysMonitorDataService sysMonitorDataService;
     private ISysMonitorDataService sysMonitorDataService;
-    @Autowired
-    private ISysSafeAreaService sysSafeAreaService;
 
 
     DecimalFormat df = new DecimalFormat("0.00");
     DecimalFormat df = new DecimalFormat("0.00");
 
 
@@ -305,30 +297,6 @@ public class SysMonthDataServiceImpl extends ServiceImpl<SysMonthDataMapper, Sys
     }
     }
 
 
     @Override
     @Override
-    public Map<String, Object> getDigitalSignageInfo(String factoryId, String structId) {
-        Map<String, Object> map = new HashMap<>();
-        SysStructDict structDict = sysStructDictMapper.getDataByCode(factoryId, structId);
-        if(structDict!=null){
-            map.put("unit",structDict);
-        }else{
-            map.put("unit",new SysStructDict());
-        }
-        List<SysEquipInfoVO> equipList = sysEquipInfoMapper.getListByCode(factoryId, structId);
-        if(equipList.size()>0){
-            map.put("equip",equipList);
-        }else {
-            map.put("equip",new ArrayList<>());
-        }
-        SysSafeArea safeArea = sysSafeAreaService.getSafeInfo(factoryId, structId);
-        if(safeArea!=null){
-            map.put("safe",safeArea);
-        }else{
-            map.put("safe",new SysSafeArea());
-        }
-        return map;
-    }
-
-    @Override
     public Map<String, Object> getDigitalSignageData(String factoryId, String structId) {
     public Map<String, Object> getDigitalSignageData(String factoryId, String structId) {
         Map<String, Object> map = new HashMap<>();
         Map<String, Object> map = new HashMap<>();
         Map<String,Object> monitorMap = new HashMap<>();
         Map<String,Object> monitorMap = new HashMap<>();

-package com.skua.modules.safe.service;
-
-import com.skua.modules.safe.entity.SysSafeArea;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 安全风险区域管理
- */
-public interface ISysSafeAreaService extends IService<SysSafeArea> {
-
-    SysSafeArea getSafeInfo(String factoryId,String structId);
-
-    List<Map<String, Object>> getSafeList(String factoryId);
-}

-package com.skua.modules.safe.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.skua.modules.safe.entity.SysSafeArea;
-import com.skua.modules.safe.mapper.SysSafeAreaMapper;
-import com.skua.modules.safe.service.ISysSafeAreaService;
-import io.swagger.annotations.ApiModelProperty;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 安全风险区域管理
- */
-@Service
-public class SysSafeAreaServiceImpl extends ServiceImpl<SysSafeAreaMapper, SysSafeArea> implements ISysSafeAreaService {
-
-    @Autowired
-    private SysSafeAreaMapper sysSafeAreaMapper;
-
-    @Override
-    public SysSafeArea getSafeInfo(String factoryId,String structId) {
-        List<SysSafeArea> list = new ArrayList<>();
-        LambdaQueryWrapper<SysSafeArea> queryWrapper = new LambdaQueryWrapper<SysSafeArea>();
-        queryWrapper.eq(SysSafeArea::getFactoryId, factoryId);
-        queryWrapper.eq(SysSafeArea::getStructId, structId);
-        list = sysSafeAreaMapper.selectList(queryWrapper);
-        if(list.size()>0){
-            return list.get(0);
-        }else{
-            return new SysSafeArea();
-        }
-    }
-
-    @Override
-    public List<Map<String, Object>> getSafeList(String factoryId) {
-        List<Map<String, Object>> list = new ArrayList<>();
-        List<SysSafeArea> safeList = new ArrayList<>();
-        LambdaQueryWrapper<SysSafeArea> queryWrapper = new LambdaQueryWrapper<SysSafeArea>();
-        queryWrapper.eq(SysSafeArea::getFactoryId, factoryId);
-        safeList = sysSafeAreaMapper.selectList(queryWrapper);
-        for ( SysSafeArea safeArea : safeList ) {
-            Map<String, Object> map = new HashMap<>();
-            map.put("structId", safeArea.getStructId());
-            map.put("structName", safeArea.getStructName());
-            list.add(map);
-        }
-        return list;
-    }
-}

@@ -15,8 +15,6 @@ import com.skua.modules.equip.service.IEquipInfoService;
 import com.skua.modules.equip.service.ISysEquipInfoService;
 import com.skua.modules.equip.service.ISysEquipInfoService;
 import com.skua.modules.monitor.entity.SysMonthData;
 import com.skua.modules.monitor.entity.SysMonthData;
 import com.skua.modules.monitor.service.ISysMonthDataService;
 import com.skua.modules.monitor.service.ISysMonthDataService;
-import com.skua.modules.safe.entity.SysSafeArea;
-import com.skua.modules.safe.service.ISysSafeAreaService;
 import com.skua.modules.shiro.vo.DefContants;
 import com.skua.modules.shiro.vo.DefContants;
 import com.skua.modules.system.entity.SysDepart;
 import com.skua.modules.system.entity.SysDepart;
 import com.skua.modules.system.entity.SysUser;
 import com.skua.modules.system.entity.SysUser;
@@ -66,8 +64,6 @@ public class MqDataController {
     @Autowired
     @Autowired
     private ISysMonthDataService sysMonthDataService;
     private ISysMonthDataService sysMonthDataService;
     @Autowired
     @Autowired
-    private ISysSafeAreaService sysSafeAreaService;
-    @Autowired
     private ITVideoService tVideoService;
     private ITVideoService tVideoService;
     @Autowired
     @Autowired
     private IPgQueryService pgQueryService;
     private IPgQueryService pgQueryService;
@@ -670,29 +666,6 @@ public class MqDataController {
         return result;
         return result;
     }
     }
 
 
-    @AutoLog(value = "获取安全区域列表")
-    @ApiOperation(value="获取安全区域列表", notes="获取安全区域列表")
-    @GetMapping(value = "/getSafeList")
-    public Result<List<Map<String,Object>>> getSafeList() {
-        Result<List<Map<String,Object>>> result = new Result<>();
-        List<Map<String,Object>> list = new ArrayList<>();
-        list = sysSafeAreaService.getSafeList(factoryId);
-        result.setResult(list);
-        result.setSuccess(true);
-        return result;
-    }
-
-    @AutoLog(value = "获取安全区域信息")
-    @ApiOperation(value="获取安全区域信息", notes="获取安全区域信息")
-    @GetMapping(value = "/getSafeInfo")
-    public Result<SysSafeArea> getSafeInfo(String structId) {
-        Result<SysSafeArea> result = new Result<>();
-        SysSafeArea sysSafeArea = new SysSafeArea();
-        sysSafeArea = sysSafeAreaService.getSafeInfo(factoryId,structId);
-        result.setResult(sysSafeArea);
-        result.setSuccess(true);
-        return result;
-    }
 
 
     @AutoLog(value = "获取摄像头列表")
     @AutoLog(value = "获取摄像头列表")
     @ApiOperation(value="获取摄像头列表", notes="获取摄像头列表")
     @ApiOperation(value="获取摄像头列表", notes="获取摄像头列表")
@@ -729,17 +702,6 @@ public class MqDataController {
     }
     }
 
 
     @AutoLog(value = "电子看板数据接口")
     @AutoLog(value = "电子看板数据接口")
-    @GetMapping(value = "/digitalSignageInfo")
-    public Result<Map<String,Object>> getDigitalSignageInfo(String structId) {
-        Result<Map<String,Object>> result = new Result<>();
-        Map<String,Object> map = new HashMap<>();
-        map = sysMonthDataService.getDigitalSignageInfo(factoryId,structId);
-        result.setResult(map);
-        result.setSuccess(true);
-        return result;
-    }
-
-    @AutoLog(value = "电子看板数据接口")
     @GetMapping(value = "/digitalSignageData")
     @GetMapping(value = "/digitalSignageData")
     public Result<Map<String,Object>> getDigitalSignageData(String structId) {
     public Result<Map<String,Object>> getDigitalSignageData(String structId) {
         Result<Map<String,Object>> result = new Result<>();
         Result<Map<String,Object>> result = new Result<>();