删除组织管理注释代码

lift-business-service/src/main/java/cn/com/ty/lift/business/applet/controller/AppletController.java

@@ -1,47 +1,12 @@
 package cn.com.ty.lift.business.applet.controller;
 
-import cn.com.ty.lift.business.applet.dao.mapper.AppletMapper;
-import cn.com.ty.lift.business.emergency.mapper.EmergencyRepairMapper;
-import cn.com.ty.lift.business.emergency.service.EmergencyRepairService;
-import cn.com.ty.lift.business.maintenance.dao.mapper.MaintenanceRecordMapper;
-import cn.com.ty.lift.business.project.dao.entity.ProjectLiftRelevance;
-import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.com.ty.lift.business.applet.service.AppletService;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-import java.util.Map;
-
 @RestController
 @AllArgsConstructor
 public class AppletController {
-    private final EmergencyRepairService emergencyRepairService;
-    private final MaintenanceRecordMapper maintenanceRecordMapper;
-
-    private final EmergencyRepairMapper emergencyRepairMapper;
-    private final AppletMapper appletMapper;
-
-    @PostMapping("/lift/info")
-    public RestResponse liftInfo(@RequestBody ProjectLiftRelevance projectLift) {
-        List<Map<String, Object>> projectLiftInfos = appletMapper.projectLiftInfo(projectLift.getProjectId(), projectLift.getLiftId());
-        if (null != projectLiftInfos) {
-            return RestResponse.success(projectLiftInfos);
-        }
-        return RestResponse.success();
-    }
-
-    //fixme 维保以及下面急修记录可能需要新增接口处理
-    @PostMapping("/record/maintenance")
-    public RestResponse maintenanceRecord() {
-        //maintenanceRecordMapper.selectMaps();
-        return RestResponse.success();
-    }
+    private final AppletService appletService;
 
-    @PostMapping("/record/emergency")
-    public RestResponse emergencyRecord() {
-//        emergencyRepairMapper.selectMaps()
-        return RestResponse.success();
-    }
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/applet/dao/entity/FeedBack.java

@@ -0,0 +1,88 @@
+package cn.com.ty.lift.business.applet.dao.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 用户反馈
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2020-01-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class FeedBack implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户反馈ID
+     */
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 电梯ID
+     */
+    @TableField("lift_id")
+    private Long liftId;
+
+    /**
+     * 维保公司ID
+     */
+    @TableField("mt_company_id")
+    private Long mtCompanyId;
+
+    /**
+     * 来源
+     */
+    @TableField("source")
+    private Integer source;
+
+    /**
+     * 类型
+     */
+    @TableField("type")
+    private Integer type;
+
+    /**
+     * 标题
+     */
+    @TableField("title")
+    private String title;
+
+    /**
+     * 内容
+     */
+    @TableField("content")
+    private String content;
+
+    /**
+     * 用户ID
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 用户帐号
+     */
+    @TableField("user_account")
+    private String userAccount;
+
+    /**
+     * 反馈时间
+     */
+    @TableField("post_date")
+    private LocalDateTime postDate;
+
+
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/applet/dao/mapper/AppletMapper.java

@@ -1,24 +1,7 @@
 package cn.com.ty.lift.business.applet.dao.mapper;
 
+import cn.com.ty.lift.business.applet.dao.entity.FeedBack;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-import java.util.Map;
-
-public interface AppletMapper extends BaseMapper<Object> {
-
-    @Select("select l.registration_code registrationCode, l.device_position devicePosition, p.project_name projectName, l.lift_type liftType, ui.name,ui.mobile\n" +
-            "from project_lift_relevance plr" +
-            "         left join lift l on plr.lift_id = l.id" +
-            "         left join user_info ui on plr.worker_id = ui.user_id" +
-            "         left join project p on plr.project_id = p.id" +
-            "  where plr.project_id = ${projectId}" +
-            "  and plr.lift_id = ${liftId}")
-        //1001104100000
-        //1001105100000
-    List<Map<String, Object>> projectLiftInfo(@Param("projectId") Long projectId, @Param("liftId") Long liftId);
-
 
+public interface AppletMapper extends BaseMapper<FeedBack> {
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/applet/service/AppletService.java

@@ -1,7 +1,10 @@
 package cn.com.ty.lift.business.applet.service;
 
+import cn.com.ty.lift.business.applet.dao.entity.FeedBack;
+import cn.com.ty.lift.business.applet.dao.mapper.AppletMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 @Service
-public class AppletService {
+public class AppletService extends ServiceImpl<AppletMapper, FeedBack> {
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/organization/controller/OrganizationController.java

@@ -17,10 +17,6 @@ import org.springframework.web.bind.annotation.RestController;
 public class OrganizationController {
     private final OrganizationService organizationService;
 
-//    public RestResponse temp(@RequestBody OrganizationReq req) {
-//        return organizationService.organization(req);
-//    }
-
     @PostMapping("/user")
     public RestResponse user(@RequestBody Project project) {
         return organizationService.users(project);

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/organization/dao/mapper/OrganizationMapper.java

@@ -18,18 +18,6 @@ import java.util.List;
  */
 public interface OrganizationMapper extends BaseMapper<Project> {
 
-//    @Select("select distinct province from project where mt_company_id = ${mtCompanyId}")
-//    List<HashMap<String, String>> provinces(@Param("mtCompanyId") Long mtCompanyId);
-//
-//    @Select("select distinct city from project where mt_company_id = ${mtCompanyId} and province=#{province}")
-//    List<HashMap<String, String>> cities(@Param("mtCompanyId") Long mtCompanyId, @Param("province") String province);
-//
-//    @Select("select distinct district from project where mt_company_id = ${mtCompanyId} and city=#{city}")
-//    List<HashMap<String, String>> districts(@Param("mtCompanyId") Long mtCompanyId, @Param("city") String city);
-//
-//    @Select("select id,project_name projectName,num from project where mt_company_id = ${mtCompanyId} and district=#{district}")
-//    List<HashMap<String, String>> projects(@Param("mtCompanyId") Long mtCompanyId, @Param("district") String district);
-
     @Select("select p.user_id userId,u.avatar_url avatar,u.name name, p.user_role role,u.mobile mobile,p.is_monitor monitor from project_user p left join user_info u on p.user_id = u.user_id where p.project_id = #{projectId} and (p.user_role in (13, 14, 15, 16) or p.is_monitor = 1)")
     List<HashMap<String, Object>> users(@Param("projectId") Long projectId);
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/organization/service/OrganizationService.java

@@ -15,60 +15,13 @@ import java.util.*;
 public class OrganizationService {
     private final ProjectServiceImpl projectService;
 
-    /**
-     * @return 省，市，区，项目列表
-     * @description 获取省，市，区，项目列表
-     * @date 2019/12/17 10:05
-     */
-//    public RestResponse organization(OrganizationReq req) {
-//        List<HashMap<String, String>> areas;
-//        HashMap<String, Object> result;
-//
-//        List<Project> list = projectService.list(new QueryWrapper<Project>()
-//                .select("province", "city", "district")
-//                .eq("mt_company_id", req.getMtCompanyId()));
-//
-//        if (req.getDistrict() != null) {
-//            List<HashMap<String, String>> projects = projectService.getBaseMapper().projects(req.getMtCompanyId(), req.getDistrict());
-//            if (projects.isEmpty()) {
-//                return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
-//            }
-//            //如果查询到了项目
-//            result = new HashMap<>();
-//            result.put("projectNum", projects.size());
-//            result.put("projects", projects);
-//            return RestResponse.ok(result, ApiConstants.RESULT_SUCCESS, "查询成功");
-//        } else if (req.getCity() != null) {
-//            areas = projectService.getBaseMapper().districts(req.getMtCompanyId(), req.getCity());
-//        } else if (req.getProvince() != null) {
-//            areas = projectService.getBaseMapper().cities(req.getMtCompanyId(), req.getProvince());
-//        } else {
-//            areas = projectService.getBaseMapper().provinces(req.getMtCompanyId());
-//            if (areas.isEmpty()) {
-//                return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
-//            }
-//        }
-//        if (areas.isEmpty()) {
-//            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
-//        }
-//        //如果查询到了区域
-//        result = new HashMap<>();
-//        result.put("areaNum", areas.size());
-//        result.put("areas", areas);
-//        return RestResponse.ok(result, ApiConstants.RESULT_SUCCESS, "查询成功");
-//    }
-
     public RestResponse users(Project project) {
         List<HashMap<String, Object>> projectUsers = projectService.getBaseMapper().users(project.getId());
         if (projectUsers.isEmpty()) {
             return RestResponse.success();
         }
         for (HashMap<String, Object> projectUser : projectUsers) {
-            Object monitor = projectUser.get("monitor");
             Object role = projectUser.get("role");
-//            if (monitor != null && monitor.equals(1)) {
-//                projectUser.replace("monitor", "维保班长");
-//            }
             if (role != null) {
                 switch (role.toString()) {
                     case "13":
@@ -89,6 +42,11 @@ public class OrganizationService {
         return RestResponse.success(projectUsers);
     }
 
+    /**
+     * @return 省，市，区，项目列表
+     * @description 获取省，市，区，项目列表
+     * @date 2019/12/17 10:05
+     */
     public RestResponse organizationTree(Long mtCompanyId) {
         List<Organization> ps = new ArrayList<>();
         List<Organization> cs = new ArrayList<>();

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/controller/GlobalSetController.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -36,8 +37,9 @@ public class GlobalSetController {
      */
     @PostMapping("list")
     public RestResponse sets(@RequestBody GlobalSet globalSet) {
-        List<GlobalSet> globalSets = globalSetService
-                .list(new QueryWrapper<GlobalSet>()
+        List<Map<String, Object>> globalSets = globalSetService
+                .listMaps(new QueryWrapper<GlobalSet>()
+                        .select("id", "type", "value", "code", "company_id companyId")
                         .eq("company_id", globalSet.getCompanyId()));
         if (globalSets.isEmpty()) {
             return RestResponse.success();