设备管理模块--设备维护、设备类型维护更新

common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java

@@ -14,15 +14,6 @@ public enum HandleEnum {
     /**车间作业控制*/
     SFC( "SFCBO:", "SFCBO:{0},{1}" ),
 
-    /**zhaungtai**/
-    STATUS("StatusBO:", "StatusBO:{0},{1}"),
-
-    /**zhaungtai**/
-    RESOURCE_TYPE("ResourceTypeBO:", "ResourceTypeBO:{0},{1}"),
-
-    /****/
-    RESOURCE_TYPE_RESOURCEBO("ResourceTypeResourceBO","ResourceTypeResourceBO:{0},{1}"),
-
     /**车间作业控制*/
     SFC_BOM( "SFCBOMBO:", "SFCBOMBO:{0}" ),
 
@@ -32,6 +23,15 @@ public enum HandleEnum {
     /**资源*/
     RESOURCE( "ResourceBO:", "ResourceBO:{0},{1}" ),
 
+    /**设备状态**/
+    STATUS("StatusBO:", "StatusBO:{0},{1}"),
+
+    /**设备类型**/
+    RESOURCE_TYPE("ResourceTypeBO:", "ResourceTypeBO:{0},{1}"),
+
+    /****/
+    RESOURCE_TYPE_RESOURCEBO("ResourceTypeResourceBO","ResourceTypeResourceBO:{0},{1}"),
+
     /**工艺路线*/
     ROUTER( "RouterBO:", "RouterBO:{0},{1},{2},{3}" ),
 

equip/src/main/java/com/foreverwin/mesnac/equip/controller/EquipController.java

@@ -1,6 +1,7 @@
 package com.foreverwin.mesnac.equip.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.foreverwin.mesnac.equip.model.Equip;
 import com.foreverwin.mesnac.equip.model.EquipType;
 import com.foreverwin.mesnac.equip.model.EquipTypeEquip;
@@ -12,6 +13,7 @@ import com.foreverwin.mesnac.meapi.service.CustomFieldsService;
 import com.foreverwin.mesnac.meapi.util.StringUtils;
 import com.foreverwin.modular.core.exception.BusinessException;
 import com.foreverwin.modular.core.util.CommonMethods;
+import com.foreverwin.modular.core.util.FrontPage;
 import com.foreverwin.modular.core.util.R;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -102,6 +104,18 @@ public class EquipController {
         Collections.sort(result);
         return R.ok(result);
     }
+    /*//设备弹出框：设备信息按分页进行展示
+    @ResponseBody
+    @GetMapping("")
+    public R getEquipList(FrontPage<Equip> frontPage, Equip equip){
+        String site = CommonMethods.getSite();
+        equip.setSite( site );
+        QueryWrapper<Equip> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(equip);
+        IPage<Equip> result;
+        result = equipService.page(frontPage.getPagePlus(), queryWrapper);
+        return R.ok(result);
+    }*/
 
     /**
      * 保存

equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EmailGroupServiceImpl.java

@@ -8,7 +8,6 @@ import com.foreverwin.mesnac.equip.model.EmailGroup;
 import com.foreverwin.mesnac.equip.service.EmailGroupService;
 import com.foreverwin.modular.core.util.FrontPage;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -26,10 +25,6 @@ import java.util.List;
 @Transactional(rollbackFor = Exception.class)
 public class EmailGroupServiceImpl extends ServiceImpl<EmailGroupMapper, EmailGroup> implements EmailGroupService {
 
-
-    @Autowired
-    private EmailGroupMapper emailGroupMapper;
-
     @Override
     public IPage<EmailGroup> selectPage(FrontPage<EmailGroup> frontPage, EmailGroup emailGroup) {
         QueryWrapper<EmailGroup> queryWrapper = new QueryWrapper<>();

generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java

@@ -32,9 +32,9 @@ public class GeneratorApplication {
         dataSourceConfig.setPassword( "wip" );
         dataSourceConfig.setTypeConvert( new OracleTypeConvert() );
         MpGenerator mpGenerator = mpGeneratorBuilder.dataSourceConfig(dataSourceConfig)
-                .tablePrefix( "APS_", "DS_", "Z_" )
+//                .tablePrefix( "APS_", "DS_", "Z_" )
                 .packageName( "com.foreverwin.mesnac.meapi" )
-                .tables("SHOP_ORDER")
+                .tables("SFC","ROUTER")
                 .author("Leon.L")
                 .uiAppId("com.foreverwin.me")
                 .uiPackage("com.foreverwin.me.migration")

meapi/src/main/resources/mapper/CustomFieldsMapper.xml

@@ -285,6 +285,16 @@
         </if>
     </delete>
 
+    <!-- 查询自定义数据-->
+    <select id="selectCustomFields" resultMap="BaseResultMap">
+        SELECT HANDLE,ATTRIBUTE,VALUE,CREATED_DATE_TIME,MODIFIED_DATE_TIME
+        FROM CUSTOM_FIELDS
+        WHERE HANDLE =#{handle}
+        <if test=" attribute != null and attribute != ''">
+            AND ATTRIBUTE =#{attribute}
+        </if>
+    </select>
+
     <!-- BaseMapper标准查询/修改/删除 -->
 
 </mapper>