业务配置更新

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/PowerBoxElecEqptController.java

@@ -35,7 +35,7 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 public class PowerBoxElecEqptController extends BaseController
 {
     @Autowired
-    private IPowerBoxElecEqptService admBoxElecEqptService;
+    private IPowerBoxElecEqptService boxElecEqptService;
 
     /**
      * 查询动力箱柜电气设备列表
@@ -45,7 +45,7 @@ public class PowerBoxElecEqptController extends BaseController
     public TableDataInfo list(PowerBoxElecEqpt boxElecEqpt)
     {
         startPage();
-        List<PowerBoxElecEqpt> list = admBoxElecEqptService.selectBoxElecEqptList(boxElecEqpt);
+        List<PowerBoxElecEqpt> list = boxElecEqptService.selectBoxElecEqptList(boxElecEqpt);
         return getDataTable(list);
     }
 
@@ -57,7 +57,7 @@ public class PowerBoxElecEqptController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, PowerBoxElecEqpt boxElecEqpt)
     {
-        List<PowerBoxElecEqpt> list = admBoxElecEqptService.selectBoxElecEqptList(boxElecEqpt);
+        List<PowerBoxElecEqpt> list = boxElecEqptService.selectBoxElecEqptList(boxElecEqpt);
         ExcelUtil<PowerBoxElecEqpt> util = new ExcelUtil<PowerBoxElecEqpt>(PowerBoxElecEqpt.class);
         util.exportExcel(response, list, "动力箱柜电气设备数据");
     }
@@ -69,7 +69,7 @@ public class PowerBoxElecEqptController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(admBoxElecEqptService.selectBoxElecEqptById(id));
+        return success(boxElecEqptService.selectBoxElecEqptById(id));
     }
 
     /**
@@ -80,7 +80,18 @@ public class PowerBoxElecEqptController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody PowerBoxElecEqpt boxElecEqpt)
     {
-        return toAjax(admBoxElecEqptService.insertBoxElecEqpt(boxElecEqpt));
+        return toAjax(boxElecEqptService.insertBoxElecEqpt(boxElecEqpt));
+    }
+
+    /**
+     * 新增动力箱柜电气设备
+     */
+    @RequiresPermissions("ems:powerBox:add")
+    @Log(title = "动力箱柜电气设备", businessType = BusinessType.INSERT)
+    @PostMapping("/batch")
+    public AjaxResult addBatch(@RequestBody List<PowerBoxElecEqpt> boxElecEqpts)
+    {
+        return toAjax(boxElecEqptService.insertBatch(boxElecEqpts));
     }
 
     /**
@@ -91,7 +102,7 @@ public class PowerBoxElecEqptController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody PowerBoxElecEqpt boxElecEqpt)
     {
-        return toAjax(admBoxElecEqptService.updateBoxElecEqpt(boxElecEqpt));
+        return toAjax(boxElecEqptService.updateBoxElecEqpt(boxElecEqpt));
     }
 
     /**
@@ -102,6 +113,6 @@ public class PowerBoxElecEqptController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(admBoxElecEqptService.deleteBoxElecEqptByIds(ids));
+        return toAjax(boxElecEqptService.deleteBoxElecEqptByIds(ids));
     }
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/EmsFacs.java

@@ -53,10 +53,6 @@ public class EmsFacs extends BaseEntity
     @Excel(name = "归属区域")
     private String refAreaName;
 
-    /** 厂商 */
-    @Excel(name = "厂商")
-    private String manufacturer;
-
     /** 扩展属性 */
     private List<EmsFacsAttr> facsAttrs;
 
@@ -123,15 +119,6 @@ public class EmsFacs extends BaseEntity
     {
         return refArea;
     }
-    public void setManufacturer(String manufacturer) 
-    {
-        this.manufacturer = manufacturer;
-    }
-
-    public String getManufacturer() 
-    {
-        return manufacturer;
-    }
 
     public List<EmsFacsAttr> getFacsAttrs() {
         return facsAttrs;
@@ -175,7 +162,6 @@ public class EmsFacs extends BaseEntity
             .append("facsSubtype", getFacsSubtype())
             .append("enable", getEnable())
             .append("refArea", getRefArea())
-            .append("manufacturer", getManufacturer())
             .append("createTime", getCreateTime())
             .append("updateTime", getUpdateTime())
             .toString();

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/EmsFacsAttrMapper.java

@@ -37,10 +37,10 @@ public interface EmsFacsAttrMapper {
     /**
      * 批量新增能源设施/系统属性
      *
-     * @param emsFacsAttrs 能源设施/系统属性
+     * @param list 能源设施/系统属性
      * @return 结果
      */
-    int insertEmsFacsAttrBatch(List<EmsFacsAttr> emsFacsAttrs);
+    int insertEmsFacsAttrBatch(List<EmsFacsAttr> list);
 
     /**
      * 修改能源设施/系统属性

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IEmsFacsAttrService.java

@@ -37,11 +37,10 @@ public interface IEmsFacsAttrService {
     /**
      * 批量新增能源设施/系统属性
      *
-     * @param facsCode 设施分类
      * @param emsFacsAttrs 能源设施/系统属性
      * @return 结果
      */
-    int insertEmsFacsAttrBatch(String facsCode, List<EmsFacsAttr> emsFacsAttrs);
+    int insertEmsFacsAttrBatch(List<EmsFacsAttr> emsFacsAttrs);
 
     /**
      * 修改能源设施/系统属性

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/EmsFacsAttrServiceImpl.java

@@ -62,14 +62,7 @@ public class EmsFacsAttrServiceImpl implements IEmsFacsAttrService {
      * @return 结果
      */
     @Override
-    public int insertEmsFacsAttrBatch(String facsCode, List<EmsFacsAttr> emsFacsAttrs) {
-        Date date = DateUtils.getNowDate();
-
-        emsFacsAttrs.forEach(emsFacsAttr -> {
-            emsFacsAttr.setFacsCode(facsCode);
-            emsFacsAttr.setCreateTime(date);
-        });
-
+    public int insertEmsFacsAttrBatch(List<EmsFacsAttr> emsFacsAttrs) {
         return emsFacsAttrMapper.insertEmsFacsAttrBatch(emsFacsAttrs);
     }
 
@@ -81,7 +74,6 @@ public class EmsFacsAttrServiceImpl implements IEmsFacsAttrService {
      */
     @Override
     public int updateEmsFacsAttr(EmsFacsAttr emsFacsAttr) {
-        emsFacsAttr.setUpdateTime(DateUtils.getNowDate());
         return emsFacsAttrMapper.updateEmsFacsAttr(emsFacsAttr);
     }
 

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/EmsFacsServiceImpl.java

@@ -110,7 +110,7 @@ public class EmsFacsServiceImpl implements IEmsFacsService {
 
         if (CollectionUtils.isNotEmpty(emsFacs.getFacsAttrs())) {
             facsAttrService.deleteEmsFacsAttrByFacsCode(emsFacs.getFacsCode());
-            facsAttrService.insertEmsFacsAttrBatch(emsFacs.getFacsCode(), emsFacs.getFacsAttrs());
+            facsAttrService.insertEmsFacsAttrBatch(emsFacs.getFacsAttrs());
         }
         else {
             facsAttrService.deleteEmsFacsAttrByFacsCode(emsFacs.getFacsCode());
@@ -132,7 +132,7 @@ public class EmsFacsServiceImpl implements IEmsFacsService {
 
         if (CollectionUtils.isNotEmpty(emsFacs.getFacsAttrs())) {
             facsAttrService.deleteEmsFacsAttrByFacsCode(emsFacs.getFacsCode());
-            facsAttrService.insertEmsFacsAttrBatch(emsFacs.getFacsCode(), emsFacs.getFacsAttrs());
+            facsAttrService.insertEmsFacsAttrBatch(emsFacs.getFacsAttrs());
         }
         else {
             facsAttrService.deleteEmsFacsAttrByFacsCode(emsFacs.getFacsCode());

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/EmsFacsAttrMapper.xml

@@ -59,8 +59,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <insert id="insertEmsFacsAttrBatch" parameterType="java.util.List">
         insert into adm_ems_facs_attr (facs_code, attr_name, attr_desc, attr_value, attr_unit, create_time, update_time) values
-        <foreach collection="emsFacsAttrs" item="emsFacsAttr" index="index" separator=",">
-            (#{emsFacsAttr.facsCode},#{emsFacsAttr.attrName},#{emsFacsAttr.attrDesc},#{emsFacsAttr.attrValue},#{emsFacsAttr.attrUnit},#{emsFacsAttr.createTime},#{emsFacsAttr.updateTime})
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.facsCode},#{item.attrName},#{item.attrDesc},#{item.attrValue},#{item.attrUnit},#{item.createTime},#{item.updateTime})
         </foreach>
     </insert>
 

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/EmsFacsMapper.xml

@@ -15,13 +15,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="enable"    column="enable"    />
         <result property="refArea"    column="ref_area"    />
         <result property="refAreaName"    column="ref_area_name"    />
-        <result property="manufacturer"    column="manufacturer"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
     <sql id="selectEmsFacsVo">
-        select f.`id`, f.`facs_code`, f.`facs_name`, f.`facs_type`, t.`name` as facs_type_name, f.`facs_subtype`, s.`name` as facs_subtype_name, f.`enable`, f.`ref_area`, a.`area_name` as ref_area_name, f.`manufacturer`, f.`create_time`, f.`update_time` from adm_ems_facs f LEFT JOIN dim_ems_facs_type t ON f.`facs_type` = t.`code` LEFT JOIN dim_ems_facs_subtype s ON f.`facs_subtype`= s.`code` LEFT JOIN adm_service_area a ON f.`ref_area` = a.`area_code`
+        select f.`id`, f.`facs_code`, f.`facs_name`, f.`facs_type`, t.`name` as facs_type_name, f.`facs_subtype`, s.`name` as facs_subtype_name, f.`enable`, f.`ref_area`, a.`area_name` as ref_area_name, f.`create_time`, f.`update_time` from adm_ems_facs f LEFT JOIN dim_ems_facs_type t ON f.`facs_type` = t.`code` LEFT JOIN dim_ems_facs_subtype s ON f.`facs_subtype`= s.`code` LEFT JOIN adm_service_area a ON f.`ref_area` = a.`area_code`
     </sql>
 
     <select id="selectEmsFacsList" parameterType="com.ruoyi.ems.domain.EmsFacs" resultMap="EmsFacsResult">
@@ -33,7 +32,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="facsSubtype != null  and facsSubtype != ''"> and f.`facs_subtype` = #{facsSubtype}</if>
             <if test="enable != null "> and f.`enable` = #{enable}</if>
             <if test="refArea != null  and refArea != ''"> and f.`ref_area` = #{refArea}</if>
-            <if test="manufacturer != null  and manufacturer != ''"> and f.`manufacturer` = #{manufacturer}</if>
         </where>
     </select>
     
@@ -56,7 +54,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="facsSubtype != null and facsSubtype != ''">facs_subtype,</if>
             <if test="enable != null">enable,</if>
             <if test="refArea != null and refArea != ''">ref_area,</if>
-            <if test="manufacturer != null">manufacturer,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
          </trim>
@@ -67,7 +64,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="facsSubtype != null and facsSubtype != ''">#{facsSubtype},</if>
             <if test="enable != null">#{enable},</if>
             <if test="refArea != null and refArea != ''">#{refArea},</if>
-            <if test="manufacturer != null">#{manufacturer},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
          </trim>
@@ -82,7 +78,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="facsSubtype != null and facsSubtype != ''">facs_subtype = #{facsSubtype},</if>
             <if test="enable != null">enable = #{enable},</if>
             <if test="refArea != null and refArea != ''">ref_area = #{refArea},</if>
-            <if test="manufacturer != null">manufacturer = #{manufacturer},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>

ems-cloud/sql/ems_server.sql

@@ -501,7 +501,6 @@ create table adm_ems_facs  (
   `facs_subtype`    varchar(32)     not null                     comment '设施子类',
   `enable`          int             default '0'                  comment '启用状态0-停用，1-启用',
   `ref_area`        varchar(32)     not null                     comment '归属区域代码',
-  `manufacturer`    varchar(64)     default null                 comment '厂商',
   `create_time`     datetime        default CURRENT_TIMESTAMP    comment '创建时间',
   `update_time`     datetime        default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP comment '更新时间',
   primary key (`id`),
@@ -509,18 +508,18 @@ create table adm_ems_facs  (
 ) engine=innodb auto_increment=1 comment = '能源设施表';
 
 -- 能源设施/系统DEMO数据
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('W201', '北区-供电网', 'W', 'W2', 1, '321283124S3001', '华设');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('W202', '南区-供电网', 'W', 'W2', 1, '321283124S3002', '华设');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('E501', '北区-光伏', 'E', 'E5', 1, '321283124S3001', '华设');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('E502', '南区-光伏', 'E', 'E5', 1, '321283124S3002', '华设');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('Z101', '北区-室内照明', 'Z', 'Z001', 1, '321283124S3001', '华设');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('Z102', '北区-室外照明', 'Z', 'Z002', 1, '321283124S3001', '华设');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('Z110', '北区-公共设施', 'Z', 'Z010', 1, '321283124S3001', '华设');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('Z120', '北区-空调设施', 'Z', 'Z020', 1, '321283124S3001', '华设');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('Z201', '南区-室内照明', 'Z', 'Z001', 1, '321283124S3002', '华设');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('Z202', '南区-室外照明', 'Z', 'Z002', 1, '321283124S3002', '华设');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('Z210', '南区-公共设施', 'Z', 'Z010', 1, '321283124S3002', '华设');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('Z220', '南区-空调设施', 'Z', 'Z020', 1, '321283124S3002', '华设');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`) VALUES ('W201', '北区-供电网', 'W', 'W2', 1, '321283124S3001');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`) VALUES ('W202', '南区-供电网', 'W', 'W2', 1, '321283124S3002');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`) VALUES ('E501', '北区-光伏', 'E', 'E5', 1, '321283124S3001');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`) VALUES ('E502', '南区-光伏', 'E', 'E5', 1, '321283124S3002');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`) VALUES ('Z101', '北区-室内照明', 'Z', 'Z001', 1, '321283124S3001');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`) VALUES ('Z102', '北区-室外照明', 'Z', 'Z002', 1, '321283124S3001');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`) VALUES ('Z110', '北区-公共设施', 'Z', 'Z010', 1, '321283124S3001');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`) VALUES ('Z120', '北区-空调设施', 'Z', 'Z020', 1, '321283124S3001');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`) VALUES ('Z201', '南区-室内照明', 'Z', 'Z001', 1, '321283124S3002');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`) VALUES ('Z202', '南区-室外照明', 'Z', 'Z002', 1, '321283124S3002');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`) VALUES ('Z210', '南区-公共设施', 'Z', 'Z010', 1, '321283124S3002');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`) VALUES ('Z220', '南区-空调设施', 'Z', 'Z020', 1, '321283124S3002');
 
 
 -- ----------------------------
@@ -537,7 +536,7 @@ create table adm_ems_facs_attr  (
   `create_time`     datetime        default CURRENT_TIMESTAMP    comment '创建时间',
   `update_time`     datetime        default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP comment '更新时间',
    primary key (`id`),
-   unique key ux_ems_facs_code(`facs_code`)
+   key ux_ems_facs_code(`facs_code`)
 ) engine=innodb auto_increment=1 comment = '能源设施属性表';
 
 -- 设施属性DEMO数据