改表名

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheck/dto/CmmsSpotcheckAddDTO.java

@@ -31,13 +31,13 @@ public class CmmsSpotcheckAddDTO implements Serializable {
     @ApiModelProperty(value = "所属点检内容名称")
     private java.lang.String contentname;
     /**设备ID*/
-    @Excel(name = "设备ID", width = 15, dictTable = "ems_tpm_equipment", dicText = "equipmentname", dicCode = "id")
-    @Dict(dictTable = "ems_tpm_equipment", dicText = "equipmentname", dicCode = "id")
+    @Excel(name = "设备ID", width = 15, dictTable = "tpm_equipment", dicText = "equipmentname", dicCode = "id")
+    @Dict(dictTable = "tpm_equipment", dicText = "equipmentname", dicCode = "id")
     @ApiModelProperty(value = "设备ID")
     private java.lang.String equipmentid;
     /**所属点检内容ID*/
-    @Excel(name = "所属点检内容ID", width = 15, dictTable = "ems_cmms_spotcheck_content", dicText = "contentname", dicCode = "id")
-    @Dict(dictTable = "ems_cmms_spotcheck_content", dicText = "contentname", dicCode = "id")
+    @Excel(name = "所属点检内容ID", width = 15, dictTable = "cmms_spotcheck_content", dicText = "contentname", dicCode = "id")
+    @Dict(dictTable = "cmms_spotcheck_content", dicText = "contentname", dicCode = "id")
     @ApiModelProperty(value = "所属点检内容ID")
     private java.lang.String spotcheckcontid;
     /**点检时间*/

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheck/entity/CmmsSpotcheck.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_cmms_spotcheck")
+@TableName("cmms_spotcheck")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_cmms_spotcheck对象", description="设备点检")
+@ApiModel(value="cmms_spotcheck对象", description="设备点检")
 public class CmmsSpotcheck implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -45,13 +45,13 @@ public class CmmsSpotcheck implements Serializable {
     @ApiModelProperty(value = "所属点检内容名称")
     private java.lang.String contentname;
 	/**设备ID*/
-	@Excel(name = "设备ID", width = 15, dictTable = "ems_tpm_equipment", dicText = "equipmentname", dicCode = "id")
-	@Dict(dictTable = "ems_tpm_equipment", dicText = "equipmentname", dicCode = "id")
+	@Excel(name = "设备ID", width = 15, dictTable = "tpm_equipment", dicText = "equipmentname", dicCode = "id")
+	@Dict(dictTable = "tpm_equipment", dicText = "equipmentname", dicCode = "id")
     @ApiModelProperty(value = "设备ID")
     private java.lang.String equipmentid;
 	/**所属点检内容ID*/
-	@Excel(name = "所属点检内容ID", width = 15, dictTable = "ems_cmms_spotcheck_content", dicText = "contentname", dicCode = "id")
-	@Dict(dictTable = "ems_cmms_spotcheck_content", dicText = "contentname", dicCode = "id")
+	@Excel(name = "所属点检内容ID", width = 15, dictTable = "cmms_spotcheck_content", dicText = "contentname", dicCode = "id")
+	@Dict(dictTable = "cmms_spotcheck_content", dicText = "contentname", dicCode = "id")
     @ApiModelProperty(value = "所属点检内容ID")
     private java.lang.String spotcheckcontid;
 	/**点检时间*/

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheck/mapper/CmmsSpotcheckMapper.java

@@ -15,7 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CmmsSpotcheckMapper extends BaseMapper<CmmsSpotcheck> {
 
-    @Select("select * from ems_cmms_spotcheck a " +
+    @Select("select * from cmms_spotcheck a " +
             "where a.id = #{spotcheckid}")
     public CmmsSpotcheck selectCmmsSpotcheckBySpotcheckid(String spotcheckid);
 

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheck/vo/CmmsSpotcheckQueryVO.java

@@ -35,13 +35,13 @@ public class CmmsSpotcheckQueryVO  implements Serializable {
     @ApiModelProperty(value = "所属点检内容名称")
     private java.lang.String contentname;
     /**设备ID*/
-    @Excel(name = "设备ID", width = 15, dictTable = "ems_tpm_equipment", dicText = "equipmentname", dicCode = "id")
-    @Dict(dictTable = "ems_tpm_equipment", dicText = "equipmentname", dicCode = "id")
+    @Excel(name = "设备ID", width = 15, dictTable = "tpm_equipment", dicText = "equipmentname", dicCode = "id")
+    @Dict(dictTable = "tpm_equipment", dicText = "equipmentname", dicCode = "id")
     @ApiModelProperty(value = "设备ID")
     private java.lang.String equipmentid;
     /**所属点检内容ID*/
-    @Excel(name = "所属点检内容ID", width = 15, dictTable = "ems_cmms_spotcheck_content", dicText = "contentname", dicCode = "id")
-    @Dict(dictTable = "ems_cmms_spotcheck_content", dicText = "contentname", dicCode = "id")
+    @Excel(name = "所属点检内容ID", width = 15, dictTable = "cmms_spotcheck_content", dicText = "contentname", dicCode = "id")
+    @Dict(dictTable = "cmms_spotcheck_content", dicText = "contentname", dicCode = "id")
     @ApiModelProperty(value = "所属点检内容ID")
     private java.lang.String spotcheckcontid;
     /**点检时间*/

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckContent/controller/CmmsSpotcheckContentController.java

@@ -125,7 +125,7 @@ public class CmmsSpotcheckContentController extends JeecgController<CmmsSpotchec
 	 */
 	@AutoLog(value = "点检内容——新增")
 	@ApiOperation(value="点检内容——新增", notes="点检内容——新增——同时新增多个点检项-点检内容")
-	//@RequiresPermissions("org.jeecg.modules:ems_cmms_spotcheck_content:add")
+	//@RequiresPermissions("org.jeecg.modules:cmms_spotcheck_content:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody CmmsSpotcheckContentAddDTO dto) {
 		CmmsSpotcheckContent cmmsSpotcheckContent = CmmsSpotcheckContentConvert.INSTANCE.convert(dto);
@@ -156,7 +156,7 @@ public class CmmsSpotcheckContentController extends JeecgController<CmmsSpotchec
 	 */
 	@AutoLog(value = "点检内容-编辑")
 	@ApiOperation(value="点检内容-编辑", notes="点检内容-编辑")
-	//@RequiresPermissions("org.jeecg.modules:ems_cmms_spotcheck_content:edit")
+	//@RequiresPermissions("org.jeecg.modules:cmms_spotcheck_content:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody CmmsSpotcheckContentAddDTO dto) {
 		CmmsSpotcheckContent cmmsSpotcheckContent = CmmsSpotcheckContentConvert.INSTANCE.convert(dto);
@@ -183,7 +183,7 @@ public class CmmsSpotcheckContentController extends JeecgController<CmmsSpotchec
 	 */
 	@AutoLog(value = "点检内容-通过id删除")
 	@ApiOperation(value="点检内容-通过id删除", notes="点检内容-通过id删除")
-	//@RequiresPermissions("org.jeecg.modules:ems_cmms_spotcheck_content:delete")
+	//@RequiresPermissions("org.jeecg.modules:cmms_spotcheck_content:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		Map<String, Object> columnMap = new HashMap<>();
@@ -201,7 +201,7 @@ public class CmmsSpotcheckContentController extends JeecgController<CmmsSpotchec
 	 */
 	@AutoLog(value = "点检内容-批量删除")
 	@ApiOperation(value="点检内容-批量删除", notes="点检内容-批量删除")
-	//@RequiresPermissions("org.jeecg.modules:ems_cmms_spotcheck_content:deleteBatch")
+	//@RequiresPermissions("org.jeecg.modules:cmms_spotcheck_content:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		for (String id: Arrays.asList(ids.split(","))){
@@ -236,7 +236,7 @@ public class CmmsSpotcheckContentController extends JeecgController<CmmsSpotchec
     * @param request
     * @param cmmsSpotcheckContent
     */
-    //@RequiresPermissions("org.jeecg.modules:ems_cmms_spotcheck_content:exportXls")
+    //@RequiresPermissions("org.jeecg.modules:cmms_spotcheck_content:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, CmmsSpotcheckContent cmmsSpotcheckContent) {
         return super.exportXls(request, cmmsSpotcheckContent, CmmsSpotcheckContent.class, "点检内容");
@@ -249,7 +249,7 @@ public class CmmsSpotcheckContentController extends JeecgController<CmmsSpotchec
     * @param response
     * @return
     */
-    //@RequiresPermissions("ems_cmms_spotcheck_content:importExcel")
+    //@RequiresPermissions("cmms_spotcheck_content:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, CmmsSpotcheckContent.class);

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckContent/dto/CmmsSpotcheckContentAddDTO.java

@@ -31,8 +31,8 @@ public class CmmsSpotcheckContentAddDTO  implements Serializable {
     @ApiModelProperty(value = "点检内容名称")
     private java.lang.String contentname;
     /**设备id*/
-    @Excel(name = "设备id", width = 15, dictTable = "ems_tpm_equipment", dicText = "equipmentname", dicCode = "id")
-    @Dict(dictTable = "ems_tpm_equipment", dicText = "equipmentname", dicCode = "id")
+    @Excel(name = "设备id", width = 15, dictTable = "tpm_equipment", dicText = "equipmentname", dicCode = "id")
+    @Dict(dictTable = "tpm_equipment", dicText = "equipmentname", dicCode = "id")
     @ApiModelProperty(value = "设备id")
     private java.lang.String equipmentid;
     /**状态：启用：0、禁用:1*/

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckContent/entity/CmmsSpotcheckContent.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_cmms_spotcheck_content")
+@TableName("cmms_spotcheck_content")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_cmms_spotcheck_content对象", description="点检内容")
+@ApiModel(value="cmms_spotcheck_content对象", description="点检内容")
 public class CmmsSpotcheckContent implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -45,8 +45,8 @@ public class CmmsSpotcheckContent implements Serializable {
     @ApiModelProperty(value = "点检内容名称")
     private java.lang.String contentname;
 	/**设备id*/
-	@Excel(name = "设备id", width = 15, dictTable = "ems_tpm_equipment", dicText = "equipmentname", dicCode = "id")
-	@Dict(dictTable = "ems_tpm_equipment", dicText = "equipmentname", dicCode = "id")
+	@Excel(name = "设备id", width = 15, dictTable = "tpm_equipment", dicText = "equipmentname", dicCode = "id")
+	@Dict(dictTable = "tpm_equipment", dicText = "equipmentname", dicCode = "id")
     @ApiModelProperty(value = "设备id")
     private java.lang.String equipmentid;
 	/**状态：启用：0、禁用:1*/

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckContent/mapper/CmmsSpotcheckContentMapper.java

@@ -22,8 +22,8 @@ public interface CmmsSpotcheckContentMapper extends BaseMapper<CmmsSpotcheckCont
      * @param equipmentid 设备ID
      * @return 点检内容
      */
-    @Select("select * from ems_cmms_spotcheck_content a " +
-            "        left join ems_tpm_equipment as e on a.equipmentid = e.id " +
+    @Select("select * from cmms_spotcheck_content a " +
+            "        left join tpm_equipment as e on a.equipmentid = e.id " +
             "        where a.equipmentid = #{equipmentid} and status=0 " +
             "        order by a.id desc " +
             "        limit 1")
@@ -33,14 +33,14 @@ public interface CmmsSpotcheckContentMapper extends BaseMapper<CmmsSpotcheckCont
      * 根据设备id修改该设备所有点检内容状态
      * 启用：0、禁用:1
      * */
-    @Select(" update ems_cmms_spotcheck_content set status = #{status} " +
+    @Select(" update cmms_spotcheck_content set status = #{status} " +
             "where equipmentid = #{equipmentid}")
     public void updateStatusByEquipmentid(String equipmentid, String status);
 
     /**
      * 根据设备id查询该设备现在点检内容已启用数量
      * */
-    @Select("select count(1) from ems_cmms_spotcheck_content " +
+    @Select("select count(1) from cmms_spotcheck_content " +
             "where equipmentid=#{equipmentid} and status='0'")
     public int numByEquipmentid(String equipmentid);
 

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckContent/vo/CmmsSpotcheckContentQueryVO.java

@@ -30,8 +30,8 @@ public class CmmsSpotcheckContentQueryVO  implements Serializable {
     @ApiModelProperty(value = "点检内容名称")
     private java.lang.String contentname;
     /**设备id*/
-    @Excel(name = "设备id", width = 15, dictTable = "ems_tpm_equipment", dicText = "equipmentname", dicCode = "id")
-    @Dict(dictTable = "ems_tpm_equipment", dicText = "equipmentname", dicCode = "id")
+    @Excel(name = "设备id", width = 15, dictTable = "tpm_equipment", dicText = "equipmentname", dicCode = "id")
+    @Dict(dictTable = "tpm_equipment", dicText = "equipmentname", dicCode = "id")
     @ApiModelProperty(value = "设备id")
     private java.lang.String equipmentid;
     /**状态：启用：0、禁用:1*/

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckContentItem/controller/CmmsSpotcheckContentItemController.java

@@ -49,7 +49,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class CmmsSpotcheckContentItemController extends JeecgController<CmmsSpotcheckContentItem, ICmmsSpotcheckContentItemService> {
 	@Autowired
 	private ICmmsSpotcheckContentItemService cmmsSpotcheckContentItemService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,7 +71,7 @@ public class CmmsSpotcheckContentItemController extends JeecgController<CmmsSpot
 		IPage<CmmsSpotcheckContentItem> pageList = cmmsSpotcheckContentItemService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -80,13 +80,13 @@ public class CmmsSpotcheckContentItemController extends JeecgController<CmmsSpot
 	 */
 	@AutoLog(value = "点检内容-点检项-添加")
 	@ApiOperation(value="点检内容-点检项-添加", notes="点检内容-点检项-添加")
-	//@RequiresPermissions("org.jeecg.modules:ems_cmms_spotcheck_content_item:add")
+	//@RequiresPermissions("org.jeecg.modules:cmms_spotcheck_content_item:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody CmmsSpotcheckContentItem cmmsSpotcheckContentItem) {
 		cmmsSpotcheckContentItemService.save(cmmsSpotcheckContentItem);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -95,13 +95,13 @@ public class CmmsSpotcheckContentItemController extends JeecgController<CmmsSpot
 	 */
 	@AutoLog(value = "点检内容-点检项-编辑")
 	@ApiOperation(value="点检内容-点检项-编辑", notes="点检内容-点检项-编辑")
-	//@RequiresPermissions("org.jeecg.modules:ems_cmms_spotcheck_content_item:edit")
+	//@RequiresPermissions("org.jeecg.modules:cmms_spotcheck_content_item:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody CmmsSpotcheckContentItem cmmsSpotcheckContentItem) {
 		cmmsSpotcheckContentItemService.updateById(cmmsSpotcheckContentItem);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -110,13 +110,13 @@ public class CmmsSpotcheckContentItemController extends JeecgController<CmmsSpot
 	 */
 	@AutoLog(value = "点检内容-点检项-通过id删除")
 	@ApiOperation(value="点检内容-点检项-通过id删除", notes="点检内容-点检项-通过id删除")
-	//@RequiresPermissions("org.jeecg.modules:ems_cmms_spotcheck_content_item:delete")
+	//@RequiresPermissions("org.jeecg.modules:cmms_spotcheck_content_item:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		cmmsSpotcheckContentItemService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -125,13 +125,13 @@ public class CmmsSpotcheckContentItemController extends JeecgController<CmmsSpot
 	 */
 	@AutoLog(value = "点检内容-点检项-批量删除")
 	@ApiOperation(value="点检内容-点检项-批量删除", notes="点检内容-点检项-批量删除")
-	//@RequiresPermissions("org.jeecg.modules:ems_cmms_spotcheck_content_item:deleteBatch")
+	//@RequiresPermissions("org.jeecg.modules:cmms_spotcheck_content_item:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.cmmsSpotcheckContentItemService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *
@@ -155,7 +155,7 @@ public class CmmsSpotcheckContentItemController extends JeecgController<CmmsSpot
     * @param request
     * @param cmmsSpotcheckContentItem
     */
-    //@RequiresPermissions("org.jeecg.modules:ems_cmms_spotcheck_content_item:exportXls")
+    //@RequiresPermissions("org.jeecg.modules:cmms_spotcheck_content_item:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, CmmsSpotcheckContentItem cmmsSpotcheckContentItem) {
         return super.exportXls(request, cmmsSpotcheckContentItem, CmmsSpotcheckContentItem.class, "点检内容-点检项");
@@ -168,7 +168,7 @@ public class CmmsSpotcheckContentItemController extends JeecgController<CmmsSpot
     * @param response
     * @return
     */
-    //@RequiresPermissions("ems_cmms_spotcheck_content_item:importExcel")
+    //@RequiresPermissions("cmms_spotcheck_content_item:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, CmmsSpotcheckContentItem.class);

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckContentItem/entity/CmmsSpotcheckContentItem.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_cmms_spotcheck_content_item")
+@TableName("cmms_spotcheck_content_item")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_cmms_spotcheck_content_item对象", description="点检内容-点检项")
+@ApiModel(value="cmms_spotcheck_content_item对象", description="点检内容-点检项")
 public class CmmsSpotcheckContentItem implements Serializable {
     private static final long serialVersionUID = 1L;
 

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckItem/entity/CmmsSpotcheckItem.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_cmms_spotcheck_item")
+@TableName("cmms_spotcheck_item")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_cmms_spotcheck_item对象", description="点检项")
+@ApiModel(value="cmms_spotcheck_item对象", description="点检项")
 public class CmmsSpotcheckItem implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -41,8 +41,8 @@ public class CmmsSpotcheckItem implements Serializable {
     @ApiModelProperty(value = "名称")
     private java.lang.String itemname;
 	/**设备类型ID*/
-	@Excel(name = "设备类型ID", width = 15, dictTable = "ems_tpm_equipment_tree", dicText = "name", dicCode = "id")
-	@Dict(dictTable = "ems_tpm_equipment_tree", dicText = "name", dicCode = "id")
+	@Excel(name = "设备类型ID", width = 15, dictTable = "tpm_equipment_tree", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "tpm_equipment_tree", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "设备类型ID")
     private java.lang.String equipmenttreeid;
 	/**点检项编号*/

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckItem/mapper/xml/CmmsSpotcheckItemMapper.xml

@@ -22,8 +22,8 @@
         select i.id, i.itemcode, i.itemname,
         i.equipmenttreeid, i.conditions, i.itemtype, i.tag,
         i.create_by, i.create_time, i.update_by, i.update_time, i.remark
-        from ems_cmms_spotcheck_item as i
+        from cmms_spotcheck_item as i
+--         left join tpm_equipment_tree as t on i.equipmenttreeid = t.id  t.name as equipmenttreename,
         <where>
             <if test="itemname != null  and itemname != ''"> and (i.itemcode like concat('%', #{itemname}, '%') or i.itemname like concat('%', #{itemname}, '%'))</if>
             <if test="equipmenttreeid != null "> and i.equipmenttreeid = #{equipmenttreeid}</if>

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckTitem/entity/CmmsSpotcheckTitem.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_cmms_spotcheck_titem")
+@TableName("cmms_spotcheck_titem")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_cmms_spotcheck_titem对象", description="设备点检-点检项")
+@ApiModel(value="cmms_spotcheck_titem对象", description="设备点检-点检项")
 public class CmmsSpotcheckTitem implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -37,8 +37,8 @@ public class CmmsSpotcheckTitem implements Serializable {
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
 	/**设备点检ID*/
-	@Excel(name = "设备点检ID", width = 15, dictTable = "ems_cmms_spotcheck", dicText = "contentname", dicCode = "id")
-	@Dict(dictTable = "ems_cmms_spotcheck", dicText = "contentname", dicCode = "id")
+	@Excel(name = "设备点检ID", width = 15, dictTable = "cmms_spotcheck", dicText = "contentname", dicCode = "id")
+	@Dict(dictTable = "cmms_spotcheck", dicText = "contentname", dicCode = "id")
     @ApiModelProperty(value = "设备点检ID")
     private java.lang.String spotcheckid;
 	/**所属点检内容-点检项ID*/
@@ -62,8 +62,8 @@ public class CmmsSpotcheckTitem implements Serializable {
     @ApiModelProperty(value = "名称")
     private java.lang.String itemname;
     /**设备类型id*/
-    @Excel(name = "设备类型id", width = 15, dictTable = "ems_tpm_equipment_tree", dicText = "name", dicCode = "id")
-    @Dict(dictTable = "ems_tpm_equipment_tree", dicText = "name", dicCode = "id")
+    @Excel(name = "设备类型id", width = 15, dictTable = "tpm_equipment_tree", dicText = "name", dicCode = "id")
+    @Dict(dictTable = "tpm_equipment_tree", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "设备类型id")
     private java.lang.String equipmenttreeid;
     /**点检项分类*/

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckTitem/vo/CmmsSpotcheckTitemQueryVO.java

@@ -20,8 +20,8 @@ public class CmmsSpotcheckTitemQueryVO implements Serializable {
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
     /**设备点检ID*/
-    @Excel(name = "设备点检ID", width = 15, dictTable = "ems_cmms_spotcheck", dicText = "contentname", dicCode = "id")
-    @Dict(dictTable = "ems_cmms_spotcheck", dicText = "contentname", dicCode = "id")
+    @Excel(name = "设备点检ID", width = 15, dictTable = "cmms_spotcheck", dicText = "contentname", dicCode = "id")
+    @Dict(dictTable = "cmms_spotcheck", dicText = "contentname", dicCode = "id")
     @ApiModelProperty(value = "设备点检ID")
     private java.lang.String spotcheckid;
     /**所属点检内容-点检项ID*/
@@ -45,8 +45,8 @@ public class CmmsSpotcheckTitemQueryVO implements Serializable {
     @ApiModelProperty(value = "名称")
     private java.lang.String itemname;
     /**设备类型id*/
-    @Excel(name = "设备类型id", width = 15, dictTable = "ems_tpm_equipment_tree", dicText = "name", dicCode = "id")
-    @Dict(dictTable = "ems_tpm_equipment_tree", dicText = "name", dicCode = "id")
+    @Excel(name = "设备类型id", width = 15, dictTable = "tpm_equipment_tree", dicText = "name", dicCode = "id")
+    @Dict(dictTable = "tpm_equipment_tree", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "设备类型id")
     private java.lang.String equipmenttreeid;
     /**点检项分类*/

module_tpm/src/main/java/org/jeecg/modules/tpmEquipment/controller/TpmEquipmentController.java

@@ -88,7 +88,7 @@ public class TpmEquipmentController extends JeecgController<TpmEquipment, ITpmEq
 	 */
 	@AutoLog(value = "设备档案-添加")
 	@ApiOperation(value="设备档案-添加", notes="设备档案-添加")
-	//@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment:add")
+	//@RequiresPermissions("org.jeecg.modules:tpm_equipment:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody TpmEquipment tpmEquipment) {
 		// 如果设备编号为空，则自动生成设备编号
@@ -107,7 +107,7 @@ public class TpmEquipmentController extends JeecgController<TpmEquipment, ITpmEq
 	 */
 	@AutoLog(value = "设备档案-编辑")
 	@ApiOperation(value="设备档案-编辑", notes="设备档案-编辑")
-	//@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment:edit")
+	//@RequiresPermissions("org.jeecg.modules:tpm_equipment:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody TpmEquipment tpmEquipment) {
 		// 如果设备编号为空，则自动生成设备编号
@@ -126,7 +126,7 @@ public class TpmEquipmentController extends JeecgController<TpmEquipment, ITpmEq
 	 */
 	@AutoLog(value = "设备档案-通过id删除")
 	@ApiOperation(value="设备档案-通过id删除", notes="设备档案-通过id删除")
-	//@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment:delete")
+	//@RequiresPermissions("org.jeecg.modules:tpm_equipment:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		tpmEquipmentService.removeById(id);
@@ -141,7 +141,7 @@ public class TpmEquipmentController extends JeecgController<TpmEquipment, ITpmEq
 	 */
 	@AutoLog(value = "设备档案-批量删除")
 	@ApiOperation(value="设备档案-批量删除", notes="设备档案-批量删除")
-	//@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment:deleteBatch")
+	//@RequiresPermissions("org.jeecg.modules:tpm_equipment:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.tpmEquipmentService.removeByIds(Arrays.asList(ids.split(",")));
@@ -171,7 +171,7 @@ public class TpmEquipmentController extends JeecgController<TpmEquipment, ITpmEq
     * @param request
     * @param tpmEquipment
     */
-    //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment:exportXls")
+    //@RequiresPermissions("org.jeecg.modules:tpm_equipment:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, TpmEquipment tpmEquipment) {
         return super.exportXls(request, tpmEquipment, TpmEquipment.class, "设备档案");
@@ -184,7 +184,7 @@ public class TpmEquipmentController extends JeecgController<TpmEquipment, ITpmEq
     * @param response
     * @return
     */
-    //@RequiresPermissions("ems_tpm_equipment:importExcel")
+    //@RequiresPermissions("tpm_equipment:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, TpmEquipment.class);

module_tpm/src/main/java/org/jeecg/modules/tpmEquipment/entity/TpmEquipment.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_tpm_equipment")
+@TableName("tpm_equipment")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_tpm_equipment对象", description="设备档案")
+@ApiModel(value="tpm_equipment对象", description="设备档案")
 public class TpmEquipment implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -41,8 +41,8 @@ public class TpmEquipment implements Serializable {
     @ApiModelProperty(value = "设备名称")
     private java.lang.String equipmentname;
 	/**设备树ID（分类id）*/
-	@Excel(name = "设备树ID（分类id）", width = 15, dictTable = "ems_tpm_equipment_tree", dicText = "name", dicCode = "id")
-	@Dict(dictTable = "ems_tpm_equipment_tree", dicText = "name", dicCode = "id")
+	@Excel(name = "设备树ID（分类id）", width = 15, dictTable = "tpm_equipment_tree", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "tpm_equipment_tree", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "设备树ID（分类id）")
     private java.lang.String equipmenttreeid;
 	/**设备编号*/

module_tpm/src/main/java/org/jeecg/modules/tpmEquipmentTree/controller/TpmEquipmentTreeController.java

@@ -223,7 +223,7 @@ public class TpmEquipmentTreeController extends JeecgController<TpmEquipmentTree
 	 */
 	@AutoLog(value = "设备树-添加")
 	@ApiOperation(value="设备树-添加", notes="设备树-添加")
-    //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_tree:add")
+    //@RequiresPermissions("org.jeecg.modules:tpm_equipment_tree:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody TpmEquipmentTree tpmEquipmentTree) {
 		tpmEquipmentTreeService.addTpmEquipmentDefine(tpmEquipmentTree);
@@ -238,7 +238,7 @@ public class TpmEquipmentTreeController extends JeecgController<TpmEquipmentTree
 	 */
 	@AutoLog(value = "设备树-编辑")
 	@ApiOperation(value="设备树-编辑", notes="设备树-编辑")
-    //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_tree:edit")
+    //@RequiresPermissions("org.jeecg.modules:tpm_equipment_tree:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody TpmEquipmentTree tpmEquipmentTree) {
 		tpmEquipmentTreeService.updateTpmEquipmentDefine(tpmEquipmentTree);
@@ -253,7 +253,7 @@ public class TpmEquipmentTreeController extends JeecgController<TpmEquipmentTree
 	 */
 	@AutoLog(value = "设备树-通过id删除")
 	@ApiOperation(value="设备树-通过id删除", notes="设备树-通过id删除")
-    //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_tree:delete")
+    //@RequiresPermissions("org.jeecg.modules:tpm_equipment_tree:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		tpmEquipmentTreeService.deleteTpmEquipmentDefine(id);
@@ -268,7 +268,7 @@ public class TpmEquipmentTreeController extends JeecgController<TpmEquipmentTree
 	 */
 	@AutoLog(value = "设备树-批量删除")
 	@ApiOperation(value="设备树-批量删除", notes="设备树-批量删除")
-    //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_tree:deleteBatch")
+    //@RequiresPermissions("org.jeecg.modules:tpm_equipment_tree:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.tpmEquipmentTreeService.removeByIds(Arrays.asList(ids.split(",")));
@@ -298,7 +298,7 @@ public class TpmEquipmentTreeController extends JeecgController<TpmEquipmentTree
     * @param request
     * @param tpmEquipmentTree
     */
-    //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_tree:exportXls")
+    //@RequiresPermissions("org.jeecg.modules:tpm_equipment_tree:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, TpmEquipmentTree tpmEquipmentTree) {
 		return super.exportXls(request, tpmEquipmentTree, TpmEquipmentTree.class, "设备树");
@@ -311,7 +311,7 @@ public class TpmEquipmentTreeController extends JeecgController<TpmEquipmentTree
     * @param response
     * @return
     */
-    //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_tree:importExcel")
+    //@RequiresPermissions("org.jeecg.modules:tpm_equipment_tree:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
 		return super.importExcel(request, response, TpmEquipmentTree.class);

module_tpm/src/main/java/org/jeecg/modules/tpmEquipmentTree/entity/TpmEquipmentTree.java

@@ -23,8 +23,8 @@ import io.swagger.annotations.ApiModelProperty;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_tpm_equipment_tree")
-@ApiModel(value="ems_tpm_equipment_tree", description="设备树")
+@TableName("tpm_equipment_tree")
+@ApiModel(value="tpm_equipment_tree", description="设备树")
 public class TpmEquipmentTree implements Serializable {
     private static final long serialVersionUID = 1L;
 

module_tpm/src/main/java/org/jeecg/modules/tpmEquipmentTree/mapper/xml/TpmEquipmentTreeMapper.xml

@@ -17,14 +17,14 @@
 	<!--获取设备树及设备列表-->
 	<select id="selectTreeAndEquipList" parameterType="org.jeecg.modules.tpmEquipmentTree.entity.TpmEquipmentTree" resultMap="EquipmentTreeResult">
 		select d.id, d.parentid, d.name
-		from ems_tpm_equipment_tree d
+		from tpm_equipment_tree d
 		union
 		select e.id as equipmenttreeid, e.equipmenttreeid as parentid, e.equipmentname as name
-		from ems_tpm_equipment as e
+		from tpm_equipment as e
 	</select>
 
 	<update id="updateTreeNodeStatus" parameterType="java.lang.String">
-		update ems_tpm_equipment_tree set has_child = #{status} where id = #{id}
+		update tpm_equipment_tree set has_child = #{status} where id = #{id}
 	</update>
 
   	<!-- 【vue3专用】 -->
@@ -34,7 +34,7 @@
 		  name as "title",
 		  (case when has_child = '1' then 0 else 1 end) as isLeaf,
 		  parentid as parentId
-		from ems_tpm_equipment_tree
+		from tpm_equipment_tree
 		where parentid = #{pid}
 		<if test="query != null">
 			<foreach collection="query.entrySet()" item="value" index="key">

module_tpm/src/main/java/org/jeecg/modules/tpmIoserverTag/controller/TpmIoserverTagController.java

@@ -93,7 +93,7 @@ public class TpmIoserverTagController extends JeecgController<TpmIoserverTag, IT
 	 */
 	@AutoLog(value = "ioserver点位-添加")
 	@ApiOperation(value="ioserver点位-添加", notes="ioserver点位-添加")
-	//@RequiresPermissions("org.jeecg.modules:ems_tpm_ioserver_tag:add")
+	//@RequiresPermissions("org.jeecg.modules:tpm_ioserver_tag:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody TpmIoserverTag tpmIoserverTag) {
 		tpmIoserverTagService.save(tpmIoserverTag);
@@ -108,7 +108,7 @@ public class TpmIoserverTagController extends JeecgController<TpmIoserverTag, IT
 	 */
 	@AutoLog(value = "ioserver点位-编辑")
 	@ApiOperation(value="ioserver点位-编辑", notes="ioserver点位-编辑")
-	//@RequiresPermissions("org.jeecg.modules:ems_tpm_ioserver_tag:edit")
+	//@RequiresPermissions("org.jeecg.modules:tpm_ioserver_tag:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody TpmIoserverTag tpmIoserverTag) {
 		tpmIoserverTagService.updateById(tpmIoserverTag);
@@ -123,7 +123,7 @@ public class TpmIoserverTagController extends JeecgController<TpmIoserverTag, IT
 	 */
 	@AutoLog(value = "ioserver点位-通过id删除")
 	@ApiOperation(value="ioserver点位-通过id删除", notes="ioserver点位-通过id删除")
-	//@RequiresPermissions("org.jeecg.modules:ems_tpm_ioserver_tag:delete")
+	//@RequiresPermissions("org.jeecg.modules:tpm_ioserver_tag:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		tpmIoserverTagService.removeById(id);
@@ -138,7 +138,7 @@ public class TpmIoserverTagController extends JeecgController<TpmIoserverTag, IT
 	 */
 	@AutoLog(value = "ioserver点位-批量删除")
 	@ApiOperation(value="ioserver点位-批量删除", notes="ioserver点位-批量删除")
-	//@RequiresPermissions("org.jeecg.modules:ems_tpm_ioserver_tag:deleteBatch")
+	//@RequiresPermissions("org.jeecg.modules:tpm_ioserver_tag:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.tpmIoserverTagService.removeByIds(Arrays.asList(ids.split(",")));
@@ -168,7 +168,7 @@ public class TpmIoserverTagController extends JeecgController<TpmIoserverTag, IT
     * @param request
     * @param tpmIoserverTag
     */
-    //@RequiresPermissions("org.jeecg.modules:ems_tpm_ioserver_tag:exportXls")
+    //@RequiresPermissions("org.jeecg.modules:tpm_ioserver_tag:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, TpmIoserverTag tpmIoserverTag) {
         return super.exportXls(request, tpmIoserverTag, TpmIoserverTag.class, "ioserver点位");
@@ -181,7 +181,7 @@ public class TpmIoserverTagController extends JeecgController<TpmIoserverTag, IT
     * @param response
     * @return
     */
-    //@RequiresPermissions("ems_tpm_ioserver_tag:importExcel")
+    //@RequiresPermissions("tpm_ioserver_tag:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, TpmIoserverTag.class);

module_tpm/src/main/java/org/jeecg/modules/tpmIoserverTag/entity/TpmIoserverTag.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_tpm_ioserver_tag")
+@TableName("tpm_ioserver_tag")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_tpm_ioserver_tag对象", description="ioserver点位")
+@ApiModel(value="tpm_ioserver_tag对象", description="ioserver点位")
 public class TpmIoserverTag implements Serializable {
     private static final long serialVersionUID = 1L;
 

module_tpm/src/main/java/org/jeecg/modules/tpmIoserverTag/mapper/xml/TpmIoserverTagMapper.xml

@@ -9,14 +9,14 @@
     </resultMap>
 
     <sql id="selectTpmIoserverTagVo">
-        select id, tagname, create_time from ems_tpm_ioserver_tag
+        select id, tagname, create_time from tpm_ioserver_tag
     </sql>
 
     <select id="selectTpmIoserverTagList" parameterType="org.jeecg.modules.tpmIoserverTag.entity.TpmIoserverTag" resultMap="TpmIoserverTagResult">
         <include refid="selectTpmIoserverTagVo"/>
         <where>
             <if test="tagname != null  and tagname != ''"> and tagname like concat('%', #{tagname}, '%')</if>
-            and tagname NOT IN (SELECT tagname FROM ems_tpm_tag)
+            and tagname NOT IN (SELECT tagname FROM tpm_tag)
         </where>
         order by tagname asc
     </select>

module_tpm/src/main/java/org/jeecg/modules/tpmTag/controller/TpmTagController.java

@@ -58,7 +58,7 @@ public class TpmTagController extends JeecgController<TpmTag, ITpmTagService> {
 	  */
 	 @AutoLog(value = "设备点位表-批量引入")
 	 @ApiOperation(value="设备点位表-批量引入", notes="设备点位表-批量引入")
-	 //@RequiresPermissions("org.jeecg.modules:ems_tpm_tag:add")
+	 //@RequiresPermissions("org.jeecg.modules:tpm_tag:add")
 	 @PostMapping(value = "/saveBatch")
 	 public Result<String> add(@RequestBody List<TpmTag> tpmTagList) {
 		 tpmTagService.saveBatch(tpmTagList);
@@ -98,7 +98,7 @@ public class TpmTagController extends JeecgController<TpmTag, ITpmTagService> {
 	 */
 	@AutoLog(value = "设备点位表-添加")
 	@ApiOperation(value="设备点位表-添加", notes="设备点位表-添加")
-	//@RequiresPermissions("org.jeecg.modules:ems_tpm_tag:add")
+	//@RequiresPermissions("org.jeecg.modules:tpm_tag:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody TpmTag tpmTag) {
 		tpmTagService.save(tpmTag);
@@ -113,7 +113,7 @@ public class TpmTagController extends JeecgController<TpmTag, ITpmTagService> {
 	 */
 	@AutoLog(value = "设备点位表-编辑")
 	@ApiOperation(value="设备点位表-编辑", notes="设备点位表-编辑")
-	//@RequiresPermissions("org.jeecg.modules:ems_tpm_tag:edit")
+	//@RequiresPermissions("org.jeecg.modules:tpm_tag:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody TpmTag tpmTag) {
 		tpmTagService.updateById(tpmTag);
@@ -128,7 +128,7 @@ public class TpmTagController extends JeecgController<TpmTag, ITpmTagService> {
 	 */
 	@AutoLog(value = "设备点位表-通过id删除")
 	@ApiOperation(value="设备点位表-通过id删除", notes="设备点位表-通过id删除")
-	//@RequiresPermissions("org.jeecg.modules:ems_tpm_tag:delete")
+	//@RequiresPermissions("org.jeecg.modules:tpm_tag:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		tpmTagService.removeById(id);
@@ -143,7 +143,7 @@ public class TpmTagController extends JeecgController<TpmTag, ITpmTagService> {
 	 */
 	@AutoLog(value = "设备点位表-批量删除")
 	@ApiOperation(value="设备点位表-批量删除", notes="设备点位表-批量删除")
-	//@RequiresPermissions("org.jeecg.modules:ems_tpm_tag:deleteBatch")
+	//@RequiresPermissions("org.jeecg.modules:tpm_tag:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.tpmTagService.removeByIds(Arrays.asList(ids.split(",")));
@@ -173,7 +173,7 @@ public class TpmTagController extends JeecgController<TpmTag, ITpmTagService> {
     * @param request
     * @param tpmTag
     */
-    //@RequiresPermissions("org.jeecg.modules:ems_tpm_tag:exportXls")
+    //@RequiresPermissions("org.jeecg.modules:tpm_tag:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, TpmTag tpmTag) {
         return super.exportXls(request, tpmTag, TpmTag.class, "设备点位表");
@@ -186,7 +186,7 @@ public class TpmTagController extends JeecgController<TpmTag, ITpmTagService> {
     * @param response
     * @return
     */
-    //@RequiresPermissions("ems_tpm_tag:importExcel")
+    //@RequiresPermissions("tpm_tag:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, TpmTag.class);

module_tpm/src/main/java/org/jeecg/modules/tpmTag/entity/TpmTag.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_tpm_tag")
+@TableName("tpm_tag")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_tpm_tag对象", description="设备点位表")
+@ApiModel(value="tpm_tag对象", description="设备点位表")
 public class TpmTag implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -37,8 +37,8 @@ public class TpmTag implements Serializable {
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
 	/**设备ID*/
-	@Excel(name = "设备ID", width = 15, dictTable = "ems_tpm_equipment", dicText = "equipmentname", dicCode = "id")
-	@Dict(dictTable = "ems_tpm_equipment", dicText = "equipmentname", dicCode = "id")
+	@Excel(name = "设备ID", width = 15, dictTable = "tpm_equipment", dicText = "equipmentname", dicCode = "id")
+	@Dict(dictTable = "tpm_equipment", dicText = "equipmentname", dicCode = "id")
     @ApiModelProperty(value = "设备ID")
     private java.lang.String equipmentid;
 	/**点位名*/