1

lefull-lot-api-web/src/main/java/cn/lefull/api/LisaController.java

@@ -43,8 +43,15 @@ public class LisaController {
 
     @NoAuth
     @GetMapping("/addEntity")
-    public ApiResponse<Object> addEquipment(String userName, Byte sex, int apartmentId, String roomNumber, Byte identity, String mobile, String idCard, String imgUrl, int employeeId) throws Exception {
+    public ApiResponse<Object> addEntity(String userName, Byte sex, int apartmentId, String roomNumber, Byte identity, String mobile, String idCard, String imgUrl, int employeeId) throws Exception {
         equipmentService.addEntity(userName, sex, apartmentId, roomNumber, identity, mobile, idCard,imgUrl, employeeId);
         return new ApiResponse<>();
     }
+
+    @NoAuth
+    @GetMapping("/updateEntity")
+    public ApiResponse<Object> updateEntity(int entityId, String userName, Byte sex, String roomNumber, Byte identity, String mobile, String idCard, String imgUrl, int employeeId) throws Exception {
+        equipmentService.updateEntity(entityId, userName, sex, roomNumber, identity, mobile, idCard,imgUrl, employeeId);
+        return new ApiResponse<>();
+    }
 }

lefull-lot-repository/src/main/java/cn/lefull/repository/mapper/face/CameraEntityMapper.java

@@ -12,4 +12,8 @@ public interface CameraEntityMapper {
     CameraEntity getEntity(int apartmentId, String userName);
 
     int addEntity(CameraEntity entity);
+
+    CameraEntity getOne(int entityId);
+
+    int updateEntity(CameraEntity entity);
 }

lefull-lot-repository/src/main/resources/mapper/face/CameraEntityMapper.xml

@@ -10,4 +10,11 @@
         INSERT INTO camera_entity (user_name, sex, apartment_id, room_number, identity, mobile, id_card, img_url, operator_employee_id)
         VALUES (#{userName}, #{sex}, #{apartmentId}, #{roomNumber}, #{identity}, #{mobile}, #{idCard}, #{imgUrl}, #{operatorEmployeeId});
     </insert>
+    <select id="getOne" resultType="cn.lefull.repository.model.face.CameraEntity">
+        SELECT * FROM camera_entity where  camera_entity_id = #{cameraEntityId}
+    </select>
+    <update id="updateEntity" keyProperty="cameraEntityId" useGeneratedKeys="true" parameterType="cn.lefull.repository.model.face.CameraEntity">
+        UPDATE camera_entity set user_name = #{userName}, sex = #{sex}, room_number = #{roomNumber}, identity = #{identity}, mobile = #{mobile}, id_card = #{idCard}, img_url = #{imgUrl}, operator_employee_id = #{operatorEmployeeId}
+        where camera_entity_id = #{cameraEntityId};
+    </update>
 </mapper>

lefull-lot-service/src/main/java/cn/lefull/service/lisa/EquipmentService.java

@@ -20,4 +20,6 @@ public interface EquipmentService {
     Pagination<EquipmentListVO> getEquipmentList(int page, int pageSize) throws Exception;
 
     void addEntity(String userName, Byte sex, int apartmentId, String roomNumber, Byte identity, String mobile, String idCard, String imgUrl, int employeeId) throws Exception;
+
+    void updateEntity(int entityId, String userName, Byte sex, String roomNumber, Byte identity, String mobile, String idCard, String imgUrl, int employeeId) throws Exception;
 }

lefull-lot-service/src/main/java/cn/lefull/service/lisa/EquipmentServiceImpl.java

@@ -159,11 +159,48 @@ public class EquipmentServiceImpl implements EquipmentService {
         String dbName = this.getFaceDbName(apartmentId);
         String entityId = this.getEntityId(id);
         String labels = this.getLabels(identity);
-        faceService.addFace(dbName, entityId, labels);
+        if(!labels.isEmpty()){
+            faceService.addFace(dbName, entityId, labels);
+        }
         String[] imgUrlList = imgUrl.split(",");
         faceService.addFaceImageList(dbName, entityId, imgUrlList);
     }
 
+    @Override
+    public void updateEntity(int entityId, String userName, Byte sex, String roomNumber, Byte identity, String mobile, String idCard, String imgUrl, int employeeId) throws Exception {
+        Utils.checkParamsNotEmpty(entityId, "entityId");
+        Utils.checkParamsNotEmpty(userName, "userName");
+        Utils.checkParamsNotEmpty(imgUrl, "imgUrl");
+        Utils.checkParamsNotEmpty(employeeId, "employeeId");
+
+        CameraEntity camera = entityMapper.getOne(entityId);
+        if(camera == null){
+            throw new Exception("参数错误");
+        }
+
+        CameraEntity entity = new CameraEntity();
+        entity.setUserName(userName);
+        entity.setSex(sex);
+        entity.setRoomNumber(roomNumber);
+        entity.setIdentity(identity);
+        entity.setMobile(mobile);
+        entity.setIdCard(idCard);
+        entity.setImgUrl(imgUrl);
+        entity.setOperatorEmployeeId(employeeId);
+        entityMapper.updateEntity(entity);
+
+        String dbName = this.getFaceDbName(camera.getApartmentId());
+        String eid = this.getEntityId(entityId);
+        String labels = this.getLabels(identity);
+        if(!identity.equals(camera.getIdentity())){
+            faceService.updateFace(dbName, eid, labels);
+        }
+        if(!imgUrl.equals(camera.getImgUrl())){
+            String[] imgUrlList = imgUrl.split(",");
+            faceService.addFaceImageList(dbName, eid, imgUrlList);
+        }
+    }
+
     private String getLabels(Byte identity)
     {
         switch (identity){