Merge remote-tracking branch 'origin/master'

cloud-model/src/main/java/com/hssx/cloudmodel/controller/MouldController.java

@@ -6,10 +6,14 @@ import com.hssx.cloudmodel.entity.Company;
 import com.hssx.cloudmodel.entity.Mould;
 import com.hssx.cloudmodel.entity.MouldEquipment;
 import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.service.*;
 import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.PageUtil;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -28,10 +32,6 @@ public class MouldController {
     @Autowired
     private UserService userService;
     @Autowired
-    private CompanyService companyService;
-    @Autowired
-    private MouldEquipmentService mouldEquipmentService;
-    @Autowired
     private ProjectService projectService;
     /**
      * 添加/修改模具设备
@@ -66,5 +66,21 @@ public class MouldController {
         msg = projectService.getModelListByCompanyId(user);
         return msg;
     }
+
+    /**
+     * 给项目分配模具获取该公司下的模具列表
+     * token 当前人唯一权限
+     * @return
+     */
+    @ApiOperation("模具列表")
+    @RequestMapping("/list")
+    @ResponseBody
+    public HttpRespMsg list(UserVO userVO, PageUtil page,String token) {
+        HttpRespMsg msg = new HttpRespMsg();
+        User user = userService.getOne(new QueryWrapper<User>().eq("head_imgurl", token));
+        BeanUtils.copyProperties(user,userVO);
+        msg = projectService.getModelListByUser(userVO,page);
+        return msg;
+    }
 }
 

cloud-model/src/main/java/com/hssx/cloudmodel/controller/MouldEquipmentController.java

@@ -4,6 +4,7 @@ package com.hssx.cloudmodel.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.entity.MouldEquipment;
 import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.vo.MouldEquipmentVO;
 import com.hssx.cloudmodel.service.MouldEquipmentService;
 import com.hssx.cloudmodel.service.UserService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
@@ -71,9 +72,9 @@ public class MouldEquipmentController {
     @ApiOperation("获取资产方公司的设备列表")
     @RequestMapping("/getMouldEquipmentList")
     @ResponseBody
-    public HttpRespMsg getMouldEquipmentList(MouldEquipment mouldEquipment){
+    public HttpRespMsg getMouldEquipmentList(MouldEquipmentVO mouldEquipmentVO){
         HttpRespMsg msg = new HttpRespMsg();
-        msg.data = mouldEquipmentService.list(new QueryWrapper<MouldEquipment>().eq("belong_company_id", mouldEquipment.getBelongCompanyId()));
+        msg.data = mouldEquipmentService.getListByCompanyId(mouldEquipmentVO);
         return msg;
     }
 

cloud-model/src/main/java/com/hssx/cloudmodel/entity/vo/MouldEquipmentVO.java

@@ -0,0 +1,21 @@
+package com.hssx.cloudmodel.entity.vo;
+
+import com.hssx.cloudmodel.entity.MouldEquipment;
+
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 08 - 05 14:00
+ * Description:<描述>
+ * Version: 1.0
+ */
+public class MouldEquipmentVO extends MouldEquipment {
+    private String companyName;
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+}

cloud-model/src/main/java/com/hssx/cloudmodel/entity/vo/MouldVO.java

@@ -0,0 +1,14 @@
+package com.hssx.cloudmodel.entity.vo;
+
+import com.hssx.cloudmodel.entity.Mould;
+
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 08 - 05 13:49
+ * Description:<描述>
+ * Version: 1.0
+ */
+public class MouldVO extends Mould {
+    private String mouldEquipmentNo;
+    private String projectName;
+}

cloud-model/src/main/java/com/hssx/cloudmodel/entity/vo/UserVO.java

@@ -11,6 +11,24 @@ import com.hssx.cloudmodel.entity.User;
 public class UserVO extends User {
     private String companyName;
     private String roleName;
+    private String keyName;//项目名称
+    private Integer serchType;//搜索类型0-项目名称，1-模具编号
+
+    public String getKeyName() {
+        return keyName;
+    }
+
+    public void setKeyName(String keyName) {
+        this.keyName = keyName;
+    }
+
+    public Integer getSerchType() {
+        return serchType;
+    }
+
+    public void setSerchType(Integer serchType) {
+        this.serchType = serchType;
+    }
 
     public String getCompanyName() {
         return companyName;

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/MouldEquipmentMapper.java

@@ -2,6 +2,9 @@ package com.hssx.cloudmodel.mapper;
 
 import com.hssx.cloudmodel.entity.MouldEquipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hssx.cloudmodel.entity.vo.MouldEquipmentVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MouldEquipmentMapper extends BaseMapper<MouldEquipment> {
 
+    List<MouldEquipmentVO> getListByCompanyId(Integer belongCompanyId);
 }

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/MouldMapper.java

@@ -3,8 +3,12 @@ package com.hssx.cloudmodel.mapper;
 import com.hssx.cloudmodel.entity.Mould;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hssx.cloudmodel.entity.Project;
+import com.hssx.cloudmodel.entity.vo.MouldVO;
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -16,4 +20,6 @@ import org.apache.ibatis.annotations.Param;
 public interface MouldMapper extends BaseMapper<Mould> {
 
     void updateMouldByProjectId(@Param("project") Project project);
+
+    List<MouldVO> selectListByCondition(UserVO userVO);
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/MouldEquipmentService.java

@@ -3,6 +3,7 @@ package com.hssx.cloudmodel.service;
 import com.hssx.cloudmodel.entity.MouldEquipment;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.vo.MouldEquipmentVO;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
 
@@ -21,4 +22,6 @@ public interface MouldEquipmentService extends IService<MouldEquipment> {
     HttpRespMsg isUse(MouldEquipment mouldEquipment, User user);
 
     HttpRespMsg getList(User user,PageUtil page);
+
+    HttpRespMsg getListByCompanyId(MouldEquipmentVO mouldEquipmentVO);
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/ProjectService.java

@@ -4,6 +4,7 @@ import com.hssx.cloudmodel.entity.Factory;
 import com.hssx.cloudmodel.entity.Project;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
 
@@ -30,4 +31,6 @@ public interface ProjectService extends IService<Project> {
     HttpRespMsg getUserListByCompanyIds(String companyIds,Integer adminId);
 
     HttpRespMsg getModelListByCompanyId(User user);
+
+    HttpRespMsg getModelListByUser(UserVO user, PageUtil page);
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldEquipmentServiceImpl.java

@@ -6,6 +6,7 @@ import com.github.pagehelper.PageInfo;
 import com.hssx.cloudmodel.constant.Constant;
 import com.hssx.cloudmodel.entity.MouldEquipment;
 import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.vo.MouldEquipmentVO;
 import com.hssx.cloudmodel.mapper.MouldEquipmentMapper;
 import com.hssx.cloudmodel.service.MouldEquipmentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -54,10 +55,12 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
         //判断是不是超级管理员，是才可操作
         if (user.getParentId() == 0) {
             //修改设备
+            MouldEquipment newMouldEquipment = mouldEquipmentMapper.selectById(mouldEquipment.getId());
+            newMouldEquipment.setIsUse(mouldEquipment.getIsUse());
             LocalDateTime now = LocalDateTime.now();
-            mouldEquipment.setStartTime(now);
-            mouldEquipment.setEndTime(now.plusYears(mouldEquipment.getUseLife()));
-            mouldEquipmentMapper.updateById(mouldEquipment);
+            newMouldEquipment.setStartTime(now);
+            newMouldEquipment.setEndTime(now.plusYears(newMouldEquipment.getUseLife()));
+            mouldEquipmentMapper.updateById(newMouldEquipment);
         } else {
             msg.setError("对不起，您不是管理员，不具备启用设备的权限");
         }
@@ -65,18 +68,26 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
     }
 
     @Override
-    public HttpRespMsg getList(User user,PageUtil page) {
+    public HttpRespMsg getList(User user, PageUtil page) {
         HttpRespMsg msg = new HttpRespMsg();
-        if(user != null){
-            if(Constant.SYS_PARENT_ID == user.getParentId()){
-                PageHelper.startPage(page.getPageNum(),page.getPageSize());
+        if (user != null) {
+            if (Constant.SYS_PARENT_ID == user.getParentId()) {
+                PageHelper.startPage(page.getPageNum(), page.getPageSize());
                 List<MouldEquipment> mouldEquipments = mouldEquipmentMapper.selectList(new QueryWrapper<MouldEquipment>());
                 PageInfo<MouldEquipment> pageInfo = new PageInfo<>(mouldEquipments);
                 msg.data = pageInfo;
-            }else{
+            } else {
                 msg.setError("对不起！您不含有查看该列表的权利。");
             }
         }
         return msg;
     }
+
+    @Override
+    public HttpRespMsg getListByCompanyId(MouldEquipmentVO mouldEquipmentVO) {
+        HttpRespMsg msg = new HttpRespMsg();
+        List<MouldEquipmentVO> list = mouldEquipmentMapper.getListByCompanyId(mouldEquipmentVO.getBelongCompanyId());
+        msg.data = list;
+        return msg;
+    }
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ProjectServiceImpl.java

@@ -5,7 +5,9 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hssx.cloudmodel.constant.Constant;
 import com.hssx.cloudmodel.entity.*;
+import com.hssx.cloudmodel.entity.vo.MouldVO;
 import com.hssx.cloudmodel.entity.vo.ProjectVO;
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.mapper.*;
 import com.hssx.cloudmodel.service.ProjectService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,9 +20,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import javax.jws.soap.SOAPBinding;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Spliterator;
+import java.util.*;
 
 /**
  * <p>
@@ -224,4 +224,31 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         msg.data =  mouldMapper.selectList(qw);
         return msg;
     }
+
+    @Override
+    public HttpRespMsg getModelListByUser(UserVO userVO, PageUtil page) {
+        HttpRespMsg msg = new HttpRespMsg();
+        List<Integer> set = new ArrayList<>();
+        if(userVO.getId() != null){
+            //资产方管理员，获取他公司下的所有模具
+            if(Constant.SYS_ID == userVO.getParentId()){
+                PageHelper.startPage(page.getPageNum(),page.getPageSize());
+                List<MouldVO> moulds = mouldMapper.selectListByCondition(userVO);
+                PageInfo<MouldVO> pageInfo = new PageInfo<>(moulds);
+                msg.data = pageInfo;
+            }else{
+                //普通用户或者项目经理
+                //充当项目经理参与的项目
+                List<Project> project = projectMapper.selectList(new QueryWrapper<Project>().eq("manager_id", userVO.getId()));
+//                if(){
+//
+//                }
+                //充当普通人员参与的项目
+
+            }
+        }else{
+            msg.setError("用户不存在，或者未登录！");
+        }
+        return msg;
+    }
 }

cloud-model/src/main/resources/application.properties

@@ -40,4 +40,9 @@ upload.path=D:/cloud/upload/
 # Single file max size  即单个文件大小
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=100MB
+##################SpringBoot连接池配置########
+spring.datasource.hikari.minimum-idle=3
+spring.datasource.hikari.maximum-pool-size=10
+spring.datasource.hikari.max-lifetime =30000
+spring.datasource.hikari.connection-test-query=SELECT 1
 

cloud-model/src/main/resources/mapper/MouldEquipmentMapper.xml

@@ -14,10 +14,34 @@
         <result column="is_use" property="isUse" />
         <result column="hill_number" property="hillNumber" />
     </resultMap>
+    <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.MouldEquipmentVO">
+        <id column="id" property="id" />
+        <result column="equipment_name" property="equipmentName" />
+        <result column="start_time" property="startTime" />
+        <result column="end_time" property="endTime" />
+        <result column="use_life" property="useLife" />
+        <result column="belong_company_id" property="belongCompanyId" />
+        <result column="companyName" property="companyName" />
+        <result column="equipment_no" property="equipmentNo" />
+        <result column="is_use" property="isUse" />
+        <result column="hill_number" property="hillNumber" />
+    </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, equipment_name, start_time, end_time, use_life, belong_company_id, equipment_no, is_use, hill_number
     </sql>
 
+    <select id="getListByCompanyId" resultMap="BaseResultMapVO">
+        select
+          tbme.id id, tbme.equipment_name equipment_name, tbme.start_time start_time, tbme.end_time end_time,
+          tbme.use_life use_life, tbme.belong_company_id belong_company_id, tbme.equipment_no equipment_no,
+          tbme.is_use, tbme.hill_number,tbc.company_name companyName
+        from
+          tb_mould_equipment tbme
+        left join
+          tb_company tbc
+        on
+          tbme.belong_company_id = tbc.id
+    </select>
 </mapper>

cloud-model/src/main/resources/mapper/MouldMapper.xml

@@ -27,6 +27,31 @@
         <result column="belong_project_grade" property="belongProjectGrade" />
         <result column="produce_company_id" property="produceCompanyId" />
     </resultMap>
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.MouldVO">
+        <id column="id" property="id" />
+        <result column="model_no" property="modelNo" />
+        <result column="model_name" property="modelName" />
+        <result column="water_gap" property="waterGap" />
+        <result column="tonnage" property="tonnage" />
+        <result column="oc_cycle" property="ocCycle" />
+        <result column="daily_output" property="dailyOutput" />
+        <result column="company_id" property="companyId" />
+        <result column="current_version_id" property="currentVersionId" />
+        <result column="state" property="state" />
+        <result column="is_delete" property="isDelete" />
+        <result column="creator_id" property="creatorId" />
+        <result column="project_id" property="projectId" />
+        <result column="rfid" property="rfid" />
+        <result column="setting_life" property="settingLife" />
+        <result column="area" property="area" />
+        <result column="factory_id" property="factoryId" />
+        <result column="factory_name" property="factoryName" />
+        <result column="initial_modulus" property="initialModulus" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="belong_project_grade" property="belongProjectGrade" />
+        <result column="produce_company_id" property="produceCompanyId" />
+    </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -35,4 +60,12 @@
     <update id="updateMouldByProjectId">
         update tb_mould set project_id = null where project_id = #{project.id}
     </update>
+
+    <select id="selectListByCondition" resultMap="BaseResultMapVO">
+        select model_no
+        from
+          tb_mould
+        left join
+
+    </select>
 </mapper>

target/classes/main/resources/application.properties

@@ -1,43 +0,0 @@
-# ####################################################################################################
-# 服务端配置
-server.port=8099
-server.servlet.context-path=/
-server.tomcat.uri-encoding=UTF-8
-# ####################################################################################################
-# thymeleaf 配置
-spring.thymeleaf.cache=false
-spring.thymeleaf.jackson.time-zone=GMT+8
-spring.thymeleaf.jackson.date-format=yyyy-MM-dd HH:mm:ss
-# ####################################################################################################
-# 数据源配置
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-spring.datasource.username=root
-spring.datasource.password=p011430seya10
-#spring.datasource.druid.test-on-borrow=true
-#spring.datasource.druid.test-while-idle=true
-# ####################################################################################################
-# MyBatis 配置
-mybatis.mapper-locations=mappers/*Mapper.xml
-mybatis.type-aliases-package=com.hssx.cloudmodel.entity/*
-# 控制台输出SQL语句
-logging.level.com.hssx.cloudmodel.mapper = debug
-# ####################################################################################################
-#配置Session
-spring.session.store-type=none
-# ####################################################################################################
-#成功页面跳转
-spring.thymeleaf.prefix=classpath:/static/
-######################################################################################################
-## redis 配置
-#spring.redis.host=localhost
-#spring.redis.port=6379
-######################################################################################################
-# 文件上传路径
-upload.path=D:/cloud/upload/
-#######################################################################################################
-# 配置上传文件的大小设置
-# Single file max size  即单个文件大小
-spring.servlet.multipart.max-file-size=10MB
-spring.servlet.multipart.max-request-size=100MB
-

target/classes/main/resources/application.yml

@@ -1,30 +0,0 @@
-
-##########
-logging:
-  level:
-    root: info
-    org.mybatis: debug
-    java.sql: debug
-    org.springframework.web: trace
-    #打印sql语句
-    com.example.plus.mapper: debug
-##########
-mybatis-plus:
-#  mapper-locations: classpath:mapper/*/*.xml
-#  #实体扫描，多个package用逗号或者分号分隔
-#  typeAliasesPackage: com.hssx.cloudmodel
-  global-config:
-    #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-    id-type: 0
-    #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-    field-strategy: 2
-    db-column-underline: true
-    refresh-mapper:
-#################插入和更新非null判断
-    db-config:
-      insert-strategy: not_null
-      update-strategy: not_null
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-

target/classes/main/resources/mapper/CompanyMapper.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hssx.cloudmodel.mapper.CompanyMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.Company">
-        <id column="id" property="id" />
-        <result column="company_name" property="companyName" />
-        <result column="company_address" property="companyAddress" />
-        <result column="company_type" property="companyType" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_name, company_address, company_type
-    </sql>
-
-    <select id="getListByKeyName" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from
-        tb_company
-        <where>
-            <if test="keyName != null and keyName != ''">
-                company_name like concat('%',#{keyName},'%')
-            </if>
-        </where>
-        Limit #{start},#{pageSize}
-    </select>
-
-</mapper>

target/classes/main/resources/mapper/CustomCompanyMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hssx.cloudmodel.mapper.CustomCompanyMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.CustomCompany">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="company_name" property="companyName" />
-        <result column="project_id" property="projectId" />
-        <result column="indate" property="indate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id, company_name, project_id, indate
-    </sql>
-
-</mapper>

target/classes/main/resources/mapper/DictionaryDataMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hssx.cloudmodel.mapper.DictionaryDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.DictionaryData">
-        <id column="id" property="id" />
-        <result column="dict_code" property="dictCode" />
-        <result column="data_name" property="dataName" />
-        <result column="dict_value" property="dictValue" />
-        <result column="dict_order" property="dictOrder" />
-        <result column="disabled" property="disabled" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, dict_code, data_name, dict_value, dict_order, disabled
-    </sql>
-
-</mapper>

target/classes/main/resources/mapper/FactoryMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hssx.cloudmodel.mapper.FactoryMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.Factory">
-        <id column="id" property="id" />
-        <result column="factory_name" property="factoryName" />
-        <result column="factory_area" property="factoryArea" />
-        <result column="y_lng" property="yLng" />
-        <result column="x_lat" property="xLat" />
-        <result column="indate" property="indate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, factory_name, factory_area, y_lng, x_lat, indate
-    </sql>
-
-</mapper>

target/classes/main/resources/mapper/MouldEquipmentMapper.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hssx.cloudmodel.mapper.MouldEquipmentMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.MouldEquipment">
-        <id column="id" property="id" />
-        <result column="equipment_name" property="equipmentName" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="use_life" property="useLife" />
-        <result column="belong_company_id" property="belongCompanyId" />
-        <result column="equipment_no" property="equipmentNo" />
-        <result column="is_use" property="isUse" />
-        <result column="hill_number" property="hillNumber" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, equipment_name, start_time, end_time, use_life, belong_company_id, equipment_no, is_use, hill_number
-    </sql>
-
-</mapper>

target/classes/main/resources/mapper/MouldMapper.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hssx.cloudmodel.mapper.MouldMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.Mould">
-        <id column="id" property="id" />
-        <result column="model_no" property="modelNo" />
-        <result column="model_name" property="modelName" />
-        <result column="water_gap" property="waterGap" />
-        <result column="tonnage" property="tonnage" />
-        <result column="oc_cycle" property="ocCycle" />
-        <result column="daily_output" property="dailyOutput" />
-        <result column="company_id" property="companyId" />
-        <result column="current_version_id" property="currentVersionId" />
-        <result column="state" property="state" />
-        <result column="is_delete" property="isDelete" />
-        <result column="creator_id" property="creatorId" />
-        <result column="project_id" property="projectId" />
-        <result column="rfid" property="rfid" />
-        <result column="setting_life" property="settingLife" />
-        <result column="area" property="area" />
-        <result column="factory_id" property="factoryId" />
-        <result column="factory_name" property="factoryName" />
-        <result column="initial_modulus" property="initialModulus" />
-        <result column="equipment_id" property="equipmentId" />
-        <result column="belong_project_grade" property="belongProjectGrade" />
-        <result column="produce_company_id" property="produceCompanyId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, model_no, model_name, water_gap, tonnage, oc_cycle, daily_output, company_id, current_version_id, state, is_delete, creator_id, project_id, rfid, setting_life, area, factory_id, factory_name, initial_modulus, equipment_id, belong_project_grade, produce_company_id
-    </sql>
-    <update id="updateMouldByProjectId">
-        update tb_mould set project_id = null where project_id = #{project.id}
-    </update>
-</mapper>

target/classes/main/resources/mapper/ProjectFileMapper.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hssx.cloudmodel.mapper.ProjectFileMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.ProjectFile">
-        <id column="id" property="id" />
-        <result column="project_id" property="projectId" />
-        <result column="uploader_id" property="uploaderId" />
-        <result column="uploader" property="uploader" />
-        <result column="file_name" property="fileName" />
-        <result column="url" property="url" />
-        <result column="file_type" property="fileType" />
-        <result column="file_size" property="fileSize" />
-        <result column="indate" property="indate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, project_id, uploader_id, uploader, file_name, url, file_type, file_size, indate
-    </sql>
-
-</mapper>

target/classes/main/resources/mapper/ProjectMapper.xml

@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hssx.cloudmodel.mapper.ProjectMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.Project">
-        <id column="id" property="id" />
-        <result column="project_name" property="projectName" />
-        <result column="project_no" property="projectNo" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="content" property="content" />
-        <result column="creator_id" property="creatorId" />
-        <result column="creator" property="creator" />
-        <result column="is_delete" property="isDelete" />
-        <result column="owner_company" property="ownerCompany" />
-        <result column="owner_company_name" property="ownerCompanyName" />
-        <result column="indate" property="indate" />
-        <result column="manager_id" property="managerId" />
-        <result column="manager" property="manager" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, project_name, project_no, start_time, end_time, content, creator_id, creator, is_delete, owner_company, owner_company_name, indate, manager_id, manager
-    </sql>
-
-    <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.ProjectVO">
-        <id column="id" property="id" />
-        <result column="project_name" property="projectName" />
-        <result column="project_no" property="projectNo" />
-        <result column="creator_id" property="creatorId" />
-        <result column="creator" property="creator" />
-        <result column="is_delete" property="isDelete" />
-        <result column="indate" property="indate" />
-        <result column="manager_id" property="managerId" />
-        <result column="manager" property="manager" />
-        <collection property="models" ofType="com.hssx.cloudmodel.entity.Mould">
-            <id column="id" property="id" />
-            <result column="model_no" property="modelNo" />
-            <result column="model_name" property="modelName" />
-        </collection>
-    </resultMap>
-
-    <select id="getProjectListByUid" resultMap="BaseResultMap">
-        select
-        p.id id,p.project_name project_name, p.creator creator,p.owner_company owner_company,
-        p.owner_company_name owner_company_name,
-        p.indate indate
-        from
-        tb_project p
-        left join tb_project_user pu
-        on p.id = pu.project_id
-        <where>
-            <if test="currentUser.id != 1">
-                pu.user_id = #{currentUser.id}
-            </if>
-            <if test="keyName != null and keyName != ''">
-                p.project_name like concat('%',#{keyName},'%')
-            </if>
-        </where>
-    </select>
-
-    <select id="getProjectById" resultMap="BaseResultMapVO">
-    select
-        p.id id, p.project_name project_name, p.project_no project_no, p.creator_id creator_id, p.creator creator, p.owner_company owner_company,
-        p.owner_company_name owner_company_name,p.indate indate,
-        m.model_no model_no,m.model_name model_name
-    from
-        tb_project p
-    left join tb_mould m
-    on p.id = m.project_id
-    where
-      p.id = #{id}
-    </select>
-
-    <resultMap id="UserResultMap" type="com.hssx.cloudmodel.entity.User">
-        <id column="id" property="id" />
-        <result column="username" property="username" />
-        <result column="role_type" property="roleType" />
-        <result column="company_id" property="companyId" />
-        <result column="head_imgurl" property="headImgurl" />
-        <result column="subordinate_type" property="subordinateType" />
-    </resultMap>
-
-    <select id="getProjectUserById" resultMap="UserResultMap">
-        select
-          u.id id, u.username username, u.indate indate, u.head_imgurl head_imgurl, u.subordinate_type subordinate_type
-        from
-          tb_project_user pu
-        left join
-          tb_user u
-        on
-          pu.user_id = u.id
-        where
-          pu.project_id = #{id}
-    </select>
-
-</mapper>

target/classes/main/resources/mapper/ProjectUserMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hssx.cloudmodel.mapper.ProjectUserMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.ProjectUser">
-        <id column="id" property="id" />
-        <result column="project_id" property="projectId" />
-        <result column="user_id" property="userId" />
-        <result column="subordinate" property="subordinate" />
-        <result column="role_type" property="roleType" />
-        <result column="subordinate_type" property="subordinateType" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, project_id, user_id, subordinate, role_type, subordinate_type
-    </sql>
-
-</mapper>

target/classes/main/resources/mapper/UserCompanyMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hssx.cloudmodel.mapper.UserCompanyMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.UserCompany">
-        <id column="id" property="id" />
-        <result column="user_id" property="userId" />
-        <result column="belong_company_id" property="belongCompanyId" />
-        <result column="cooperation_company_id" property="cooperationCompanyId" />
-        <result column="indate" property="indate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, user_id, belong_company_id, cooperation_company_id, indate
-    </sql>
-
-</mapper>

target/classes/main/resources/mapper/UserMapper.xml

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hssx.cloudmodel.mapper.UserMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.User">
-        <id column="id" property="id" />
-        <result column="account" property="account" />
-        <result column="username" property="username" />
-        <result column="password" property="password" />
-        <result column="mobile" property="mobile" />
-        <result column="role_type" property="roleType" />
-        <result column="company_id" property="companyId" />
-        <result column="parent_id" property="parentId" />
-        <result column="sex" property="sex" />
-        <result column="role_name" property="roleName" />
-        <result column="work_state" property="workState" />
-        <result column="is_disable" property="isDisable" />
-        <result column="indate" property="indate" />
-        <result column="head_imgurl" property="headImgurl" />
-        <result column="team_name" property="teamName" />
-        <result column="subordinate_type" property="subordinateType" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, account, username, password, mobile, role_type, company_id, parent_id, sex, role_name, work_state, is_disable, indate, head_imgurl, team_name, subordinate_type
-    </sql>
-
-    <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.UserVO">
-        <id column="id" property="id" />
-        <result column="account" property="account" />
-        <result column="username" property="username" />
-        <result column="password" property="password" />
-        <result column="mobile" property="mobile" />
-        <result column="role_type" property="roleType" />
-        <result column="role_name" property="roleName" />
-        <result column="company_id" property="companyId" />
-        <result column="company_name" property="companyName"/>
-        <result column="parent_id" property="parentId" />
-        <result column="sex" property="sex" />
-        <result column="work_state" property="workState" />
-        <result column="is_disable" property="isDisable" />
-        <result column="indate" property="indate" />
-        <result column="head_imgurl" property="headImgurl" />
-        <result column="team_name" property="teamName" />
-        <result column="subordinate_type" property="subordinateType" />
-    </resultMap>
-
-    <select id="selectListByCondition" resultMap="BaseResultMapVO">
-        SELECT
-        u.id id, u.account account, u.username username, u.password password, u.mobile mobile, u.role_type role_type, u.company_id company_id, c.`company_name` company_name,
-        u.role_name role_name,u.parent_id parent_id, u.sex sex, u.work_state work_state, u.is_disable is_disable,
-        u.indate indate, u.head_imgurl head_imgurl, u.team_name team_name, u.subordinate_type subordinate_type
-        FROM
-        tb_user AS u
-        LEFT JOIN tb_company c
-        ON u.company_id = c.`id`
-        <where>
-            u.id != #{user.id}
-            <if test="user.id != 1">
-                AND u.parent_id = #{user.id}
-            </if>
-            <if test="flag==0 and keyName != '' and keyName !=null">
-                AND u.username like concat('%',#{keyName},'%')
-            </if>
-            <if test="flag==1 and keyName != '' and keyName !=null">
-                AND u.account like concat('%',#{keyName},'%')
-            </if>
-            <if test="companyId != -1">
-                AND  u.company_id = #{companyId}
-            </if>
-        </where>
-        Order by u.id desc
-    </select>
-
-</mapper>