南昌市物联网技防平台-后台
zengh
2021-04-23 a3b023b9152b711c3ce19711a88f1ced520b16d2
app接口
8 files modified
28 ■■■■■ changed files
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/depl/entity/Depl.java 2 ●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/depl/mapper/DeplMapper.xml 2 ●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java 4 ●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java 1 ●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml 5 ●●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java 2 ●●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java 5 ●●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java 7 ●●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/depl/entity/Depl.java
@@ -57,7 +57,7 @@
    * 电话
    */
        @ApiModelProperty(value = "电话")
        private String call;
        private String calls;
    /**
    * 图片地址
    */
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/depl/mapper/DeplMapper.xml
@@ -7,7 +7,7 @@
        <id column="id" property="id"/>
        <result column="deviceNumber" property="devicenumber"/>
        <result column="contacts" property="contacts"/>
        <result column="call" property="call"/>
        <result column="call" property="calls"/>
        <result column="paddress" property="paddress"/>
        <result column="deploymentTime" property="deploymenttime"/>
        <result column="deviceName" property="devicename"/>
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
@@ -369,6 +369,10 @@
//            catalogService.updateCatalog(deviceName,deviceNumber,pId);
//        }
        if (equipment.getPaddress() != null && !equipment.getPaddress().equals("")) {
            equipmentService.saveImg(equipment);
        }
        System.out.println(equipment.getDeptId());
        return R.status(equipmentService.saveOrUpdate(equipment));
    }
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
@@ -41,6 +41,7 @@
    void s(Equipment equipment);
    void updateOne(Equipment equipment);
    void saveImg(EquipmentVO equipment);
    void updataType(String arr);
    void updataTypeC(String arr);
    /**
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
@@ -217,6 +217,11 @@
       INSERT INTO sys_equipment (deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,coordinate,parent_id,jd,wd,addvcd,street,dtype) VALUES (#{deviceName},#{deviceNumber},#{deviceType},#{ownership},#{yname},#{devicestate},#{stime},POINT(#{jd},#{wd}),#{parentId},#{jd},#{wd},#{addvcd},#{streeName},#{dtype})
    </insert>
    <!--新增-->
    <insert id="saveImg" parameterType="org.springblade.jfpt.equipment.entity.Equipment">
       INSERT INTO sys_depl (deviceName,deviceNumber,contacts,calls,paddress,deploymentTime) VALUES (#{deviceName},#{deviceNumber},#{contacts},#{call},#{paddress},#{deploymentTime})
    </insert>
    <select id="tree" resultMap="treeNodeResultMap">
          select id, parent_id, deviceName as title, id as "value", id as "key" from sys_equipment
    </select>
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java
@@ -52,6 +52,8 @@
    void updateOne(Equipment equipment);
    void saveImg(EquipmentVO equipment);
    void s(Equipment equipment);
    void updataType(String arr);
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
@@ -93,6 +93,11 @@
    }
    @Override
    public void saveImg(EquipmentVO equipment) {
        baseMapper.saveImg(equipment);
    }
    @Override
    public void s(Equipment equipment) {
        baseMapper.s(equipment);
    }
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
@@ -43,4 +43,11 @@
    //设备是否处于报警状态
    String jtype;
    String contacts;
    String call;
    String paddress;
    String deploymentTime;
}