Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	.idea/modules.xml

.gitignore

@@ -11,4 +11,4 @@ out
 gen
 /.idea/misc.xml
 /.idea/modules.xml
-/.idea/workspace.xml
+/.idea/workspace.xml

.idea/compiler.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
@@ -12,6 +13,7 @@
     <bytecodeTargetLevel>
       <module name="cloud-model" target="1.8" />
       <module name="model" target="1.8" />
+      <module name="yunsu" target="1.8" />
     </bytecodeTargetLevel>
   </component>
 </project>

.idea/encodings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/model" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/model/cloud-model" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/cloud-model" charset="UTF-8" />
   </component>
 </project>

.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_2.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.github.jsqlparser:jsqlparser:1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/misc.xml

@@ -7,6 +7,7 @@
     <option name="originalFiles">
       <list>
         <option value="$PROJECT_DIR$/model/pom.xml" />
+        <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
   </component>

.idea/modules.xml

@@ -2,8 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/model/cloud-model/cloud-model.iml" filepath="$PROJECT_DIR$/model/cloud-model/cloud-model.iml" />
-      <module fileurl="file://$PROJECT_DIR$/model/model.iml" filepath="$PROJECT_DIR$/model/model.iml" />
+      <module fileurl="file://$PROJECT_DIR$/cloud-model/cloud-model.iml" filepath="$PROJECT_DIR$/cloud-model/cloud-model.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/yunsu.iml" filepath="$PROJECT_DIR$/.idea/yunsu.iml" />
     </modules>
   </component>

.idea/yunsu.iml

@@ -1,11 +1,79 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/model/cloud-model" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/cloud-model/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.26" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
+    <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:3.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.attoparser:attoparser:2.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
+    <orderEntry type="library" name="Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.21" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.21" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.21" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.17.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.springframework.boot:spring-boot-devtools:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.8" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.9.13" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.13" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.15" level="project" />
   </component>
 </module>

model/cloud-model/pom.xml

@@ -29,6 +29,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper</artifactId>
+            <version>4.1.0</version>  <!--我这里用的是4.1.0版本-->
+        </dependency>
+
         <!-- mybatis-plus依赖 -->
         <dependency>
             <groupId>com.baomidou</groupId>

cloud-model/src/main/java/com/hssx/cloudmodel/CloudModelApplication.java

@@ -0,0 +1,32 @@
+package com.hssx.cloudmodel;
+
+import com.github.pagehelper.PageHelper;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.annotation.Bean;
+
+import java.util.Properties;
+
+@SpringBootApplication
+@MapperScan("com.hssx.cloudmodel.mapper")
+public class CloudModelApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(CloudModelApplication.class, args);
+    }
+
+    @Bean
+    public PageHelper pageHelper(){
+        PageHelper pageHelper = new PageHelper();
+        Properties properties = new Properties();
+        properties.setProperty("offsetAsPageNum","true");
+        properties.setProperty("rowBoundsWithCount","true");
+        properties.setProperty("reasonable","true");
+        properties.setProperty("dialect","mysql");    //配置mysql数据库的方言
+        pageHelper.setProperties(properties);
+        return pageHelper;
+    }
+
+}

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

@@ -1,16 +1,16 @@
 package com.hssx.cloudmodel.controller;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.entity.Company;
-import com.hssx.cloudmodel.entity.Role;
 import com.hssx.cloudmodel.service.CompanyService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.PageUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +18,6 @@ import javax.servlet.http.HttpServletResponse;
 
 
 /**
- *
  * @author 吴涛涛
  * @since 2019-07-26
  */
@@ -32,9 +31,9 @@ public class CompanyController {
 
     /**
      * 添加/修改公司
-     * @param company
-     * 参数：companyName 公司名 companyAddress 公司地址
-     * @param flag 0-添加，1-修改
+     *
+     * @param company 参数：companyName 公司名 companyAddress 公司地址
+     * @param flag    0-添加，1-修改
      * @return
      */
     @ApiOperation("添加/修改公司")
@@ -43,40 +42,38 @@ public class CompanyController {
     public HttpRespMsg addAndUpdateRole(Company company, HttpServletRequest request, Integer flag,
                                         HttpServletResponse response) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg = companyService.addAndUpdateRole(company,flag);
+        msg = companyService.addAndUpdateRole(company, flag);
         return msg;
     }
 
     /**
      * 删除公司
-     * @param company
-     * 参数 id 公司id
+     *
+     * @param company 参数 id 公司id
      * @return
      */
     @ApiOperation("删除公司")
     @RequestMapping("/delete")
     @ResponseBody
     public HttpRespMsg delete(Company company, HttpServletRequest request,
-                                        HttpServletResponse response) {
+                              HttpServletResponse response) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg.data = companyService.removeById(company.getId());
+        msg.data = companyService.deleteById(company.getId());
         return msg;
     }
 
     /**
      * 公司列表
-     * @param keyName 关键字查询 根据公司名称检索
+     * 参数：pageNum 当前页码，pageSize 每页条数 keyName 关键字查询
      * @return
      */
     @ApiOperation("公司列表")
     @RequestMapping("/list")
     @ResponseBody
-    public HttpRespMsg deleteRole(String keyName, HttpServletRequest request,
-                                  HttpServletResponse response) {
+    public HttpRespMsg deleteRole(@RequestParam(required = false)String keyName, HttpServletRequest request,
+                                  HttpServletResponse response, PageUtil page) {
         HttpRespMsg msg = new HttpRespMsg();
-        QueryWrapper<Company> qw = new QueryWrapper<>();
-        qw.like("company_name",keyName);
-        msg.data = companyService.list(qw);
+        msg = companyService.pageList(page,keyName);
         return msg;
     }
 

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

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-07-25
  */
 @RestController
-@RequestMapping("/dictionary-data")
+@RequestMapping("/dictionarydata")
 public class DictionaryDataController {
 
 }

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

@@ -7,11 +7,13 @@ import com.hssx.cloudmodel.entity.Factory;
 import com.hssx.cloudmodel.service.CompanyService;
 import com.hssx.cloudmodel.service.FactoryService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.PageUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
@@ -19,7 +21,6 @@ import javax.servlet.http.HttpServletResponse;
 
 
 /**
- *
  * @author 吴涛涛
  * @since 2019-07-26
  */
@@ -34,26 +35,24 @@ public class FactoryController {
 
     /**
      * 添加/修改工厂
-     * @param factory
-     * 参数：factoryName 工厂名 factoryArea 公司地址
-     * yLng 经度  xLat 纬度
-     * @param flag 0-添加，1-修改
+     *
+     * @param factory 参数：factoryName 工厂名 factoryArea 公司地址
+     *                yLng 经度  xLat 纬度
+     * @param flag    0-添加，1-修改
      * @return
      */
     @ApiOperation("添加/修改工厂")
     @RequestMapping("/add")
     @ResponseBody
-    public HttpRespMsg addAndUpdateRole(Factory factory, HttpServletRequest request, Integer flag,
+    public HttpRespMsg addAndUpdateFactory(Factory factory, HttpServletRequest request, Integer flag,
                                         HttpServletResponse response) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg = factoryService.addAndUpdateRole(factory,flag);
+        msg = factoryService.addAndUpdateFactory(factory, flag);
         return msg;
     }
 
     /**
-     *
-     * @param factory
-     * 参数：id 工厂id
+     * @param factory 参数：id 工厂id
      * @return
      */
     @ApiOperation("删除公司")
@@ -68,19 +67,16 @@ public class FactoryController {
 
     /**
      * 工厂列表
-     * @param keyName
-     * 参数: 关键字
+     * 参数: pageNum 当前页码，pageSize 每页条数 keyName 关键字查询
      * @return
      */
     @ApiOperation("工厂列表")
     @RequestMapping("/list")
     @ResponseBody
-    public HttpRespMsg deleteRole(String keyName, HttpServletRequest request,
-                                  HttpServletResponse response) {
+    public HttpRespMsg deleteRole(@RequestParam(required = false) String keyName, HttpServletRequest request,
+                                  HttpServletResponse response, PageUtil page) {
         HttpRespMsg msg = new HttpRespMsg();
-        QueryWrapper<Factory> qw = new QueryWrapper<>();
-        qw.like("factory_name",keyName);
-        msg.data = factoryService.list(qw);
+        msg = factoryService.pageList(page, keyName);
         return msg;
     }
 

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

@@ -0,0 +1,21 @@
+package com.hssx.cloudmodel.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-30
+ */
+@RestController
+@RequestMapping("/mould")
+public class MouldController {
+
+}
+

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

@@ -0,0 +1,97 @@
+package com.hssx.cloudmodel.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.cloudmodel.entity.Project;
+import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.service.ProjectService;
+import com.hssx.cloudmodel.service.UserService;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.PageUtil;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ * @author 吴涛涛
+ * @since 2019-07-27
+ */
+@Controller
+@RequestMapping("/project")
+public class ProjectController{
+    @Autowired
+    private ProjectService projectService;
+    @Autowired
+    private UserService userService;
+
+    /**
+     * 添加/修改项目
+     * 参数：projectName 项目名 ,customerCompany 客户方公司id
+     * customerCompanyName 客户方公司名称 chargerId 负责人id,charger 负责人姓名
+     * 修改时/添加时分配项目: id 项目id ，userIds 参与项目的用户id 如：“1,2,3”(多个或者一个)()
+     * flag 0-添加，1-修改
+     *
+     * @return
+     */
+    @ApiOperation("添加/修改项目")
+    @RequestMapping("/add")
+    @ResponseBody
+    public HttpRespMsg addAndUpdateProject(Project project, HttpServletRequest request, Integer flag,
+                                           HttpServletResponse response, String token,@RequestParam(required = false) String userIds) {
+        HttpRespMsg msg = new HttpRespMsg();
+        QueryWrapper<User> qw = new QueryWrapper<>();
+        qw.eq("head_imgurl",token);
+        User user = userService.getOne(qw);
+        msg = projectService.addAndUpdateProject(project, flag, user,userIds);
+        return msg;
+    }
+
+    /**
+     * 分配项目
+     * 参数: pageNum 当前页码，pageSize 每页条数 keyName 关键字查询 token 用户唯一凭证
+     *
+     * @return
+     */
+    @ApiOperation("项目列表")
+    @RequestMapping("/list")
+    @ResponseBody
+    public HttpRespMsg handOutProject(@RequestParam(required = false) String keyName, PageUtil page, String token) {
+        User currentUser = userService.getOne(new QueryWrapper<User>().eq("head_imgurl", token));
+        HttpRespMsg msg = projectService.getList(keyName,page,currentUser);
+        return msg;
+    }
+
+    /**
+     * 获取用户列表
+     * 参数: companyId 公司id，subordinateType 所属方 0-供应商 1-客户
+     * 以上两参数可以都不传，或者选择传其中一个
+     * @return
+     */
+    @ApiOperation("获取用户列表")
+    @RequestMapping("/getUserList")
+    @ResponseBody
+    public HttpRespMsg getUserByCompanyIdOrSubordinateType(User user) {
+        HttpRespMsg msg = projectService.getUserByCompanyIdOrSubordinateType(user);
+        return msg;
+    }
+
+    /**
+     * 项目详情
+     * 参数: id 项目id
+     * @return
+     */
+    @ApiOperation("项目详情")
+    @RequestMapping("/detail")
+    @ResponseBody
+    public HttpRespMsg getUserByCompanyIdOrSubordinateType(Project project) {
+        HttpRespMsg msg = projectService.getProjectDetail(project);
+        return msg;
+    }
+
+}
+

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

@@ -0,0 +1,21 @@
+package com.hssx.cloudmodel.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-30
+ */
+@RestController
+@RequestMapping("/project-file")
+public class ProjectFileController {
+
+}
+

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

@@ -0,0 +1,17 @@
+package com.hssx.cloudmodel.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author 吴涛涛
+ * @since 2019-07-29
+ */
+@RestController
+@RequestMapping("/projectuser")
+public class ProjectUserController {
+
+}
+

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

@@ -1,25 +1,27 @@
 package com.hssx.cloudmodel.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.cloudmodel.entity.Company;
 import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.service.CompanyService;
 import com.hssx.cloudmodel.service.UserService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.MD5Util;
+import com.hssx.cloudmodel.util.PageUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
- * <p>
- * 前端控制器
- * </p>
- *
  * @author 吴涛涛
  * @since 2019-07-26
  */
@@ -29,6 +31,8 @@ import javax.servlet.http.HttpServletResponse;
 public class UserController {
     @Autowired
     private UserService userService;
+    @Autowired
+    private CompanyService companyService;
 
     /**
      *
@@ -37,32 +41,44 @@ public class UserController {
      * @return
      */
     @ApiOperation(value = "普通用户登录", notes = "登录方法")
-    @RequestMapping("login")
+    @RequestMapping("/login")
     @ResponseBody
     public HttpRespMsg sysLogin(User user, HttpServletRequest request,
                                 HttpServletResponse response) {
         log.info("user"+user);
+        HttpRespMsg msg = userService.login(user,request);
+        return msg;
+    }
+
+    /**
+     * 创建账号是所获取的公司列表
+     * @return
+     */
+    @ApiOperation(value = "获取公司列表")
+    @RequestMapping("/getCompanyList")
+    @ResponseBody
+    public HttpRespMsg getCompanyList(){
         HttpRespMsg msg = new HttpRespMsg();
-        msg = userService.login(user,request);
+        List<Company> list = companyService.getIdAndNamelist();
+        msg.data = list;
         return msg;
     }
 
     /**
      * 添加/修改用户
      *
-     * @param user
      * 参数：account 账号 username 用户名（账号使用者的名字）
      * password 密码 ,mobile 手机号 ,roleType 角色类型, companyId 所属公司id
-     * @param flag 0-添加，1-修改
+     * teamName 团体名称 ：客户方、供应方
+     * flag 0-添加，1-修改 subordinateType 所属团队 0-供应商 1-客户
      * @return
      */
     @ApiOperation("添加/修改用户")
     @RequestMapping("/add")
     @ResponseBody
-    public HttpRespMsg addAndUpdateRole(User user, HttpServletRequest request, Integer flag,
+    public HttpRespMsg addAndUpdateUser(User user, HttpServletRequest request, Integer flag,
                                         HttpServletResponse response) {
-        HttpRespMsg msg = new HttpRespMsg();
-        msg = userService.addAndUpdateRole(user, flag);
+        HttpRespMsg msg = userService.addAndUpdateUser(user, flag);
         return msg;
     }
 
@@ -85,19 +101,40 @@ public class UserController {
 
     /**
      * 删除角色
-     * @param user
      * 参数 id 角色id
      * @return
      */
-    @ApiOperation("删除角色")
+    @ApiOperation("删除用户")
     @RequestMapping("/delete")
     @ResponseBody
-    public HttpRespMsg deleteRole(User user, HttpServletRequest request,
+    public HttpRespMsg deleteUser(User user, HttpServletRequest request,
                                   HttpServletResponse response) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg.data = userService.removeById(user.getId());
+        msg.data= userService.removeById(user.getId());
         return msg;
     }
 
+    /**
+     *用户列表
+     * 参数：pageNum 当前页码，pageSize 每页条数 keyName 关键字查询
+     * account 用户账号 token 用户凭证 roleType 角色类型
+     * roleType 角色类型 （默认-2）companyId 公司id(默认-1)
+     * flag 账号或者名字筛选 （默认0）按名字筛选，1-按账号筛选
+     * @return
+     */
+    @ApiOperation("用户列表")
+    @RequestMapping("/list")
+    @ResponseBody
+    public HttpRespMsg list(@RequestParam(required = false) Integer roleType,@RequestParam(required = false) Integer companyId, HttpServletRequest request,String token,
+                            HttpServletResponse response, PageUtil page,@RequestParam(required = false)String keyName,@RequestParam Integer flag) {
+        HttpRespMsg msg = new HttpRespMsg();
+        User newUser = userService.getOne(new QueryWrapper<User>().eq("head_imgurl", token));
+        if(newUser != null){
+            msg = userService.pageList(page,companyId,flag,keyName,newUser,roleType);
+        }else{
+            msg.setError("当前用户不存，或涉及到权限问题，请重新登录");
+        }
+        return msg;
+    }
 }
 

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

@@ -0,0 +1,335 @@
+package com.hssx.cloudmodel.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-30
+ */
+@TableName("tb_mould")
+public class Mould extends Model<Mould> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 模具编号
+     */
+    @TableField("model_no")
+    private String modelNo;
+
+    /**
+     * 模具名称
+     */
+    @TableField("model_name")
+    private String modelName;
+
+    /**
+     * 水隙
+     */
+    @TableField("water_gap")
+    private BigDecimal waterGap;
+
+    /**
+     * 吨位
+     */
+    @TableField("tonnage")
+    private BigDecimal tonnage;
+
+    /**
+     * 电量
+     */
+    @TableField("hill_number")
+    private String hillNumber;
+
+    /**
+     * 每模平均周期
+     */
+    @TableField("oc_cycle")
+    private BigDecimal ocCycle;
+
+    /**
+     * 日输出量
+     */
+    @TableField("daily_output")
+    private BigDecimal dailyOutput;
+
+    /**
+     * 所属客户公司id
+     */
+    @TableField("company_id")
+    private Integer companyId;
+
+    /**
+     * 当前版本id
+     */
+    @TableField("current_version_id")
+    private Integer currentVersionId;
+
+    /**
+     * 状态
+     */
+    @TableField("state")
+    private String state;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_delete")
+    private Integer isDelete;
+
+    /**
+     * 创建者id
+     */
+    @TableField("creator_id")
+    private Integer creatorId;
+
+    /**
+     * 项目id
+     */
+    @TableField("project_id")
+    private Integer projectId;
+
+    /**
+     * 模具对应的射频识别
+     */
+    @TableField("rfid")
+    private String rfid;
+
+    /**
+     * 使用寿命
+     */
+    @TableField("setting_life")
+    private Integer settingLife;
+
+    /**
+     * 工厂位置
+     */
+    @TableField("area")
+    private String area;
+
+    /**
+     * 工厂id
+     */
+    @TableField("factory_id")
+    private Integer factoryId;
+
+    /**
+     * 工厂名称
+     */
+    @TableField("factory_name")
+    private String factoryName;
+
+    /**
+     * 初始模次(保养设定次数)
+     */
+    @TableField("initial_modulus")
+    private Integer initialModulus;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getModelNo() {
+        return modelNo;
+    }
+
+    public void setModelNo(String modelNo) {
+        this.modelNo = modelNo;
+    }
+
+    public String getModelName() {
+        return modelName;
+    }
+
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+
+    public BigDecimal getWaterGap() {
+        return waterGap;
+    }
+
+    public void setWaterGap(BigDecimal waterGap) {
+        this.waterGap = waterGap;
+    }
+
+    public BigDecimal getTonnage() {
+        return tonnage;
+    }
+
+    public void setTonnage(BigDecimal tonnage) {
+        this.tonnage = tonnage;
+    }
+
+    public String getHillNumber() {
+        return hillNumber;
+    }
+
+    public void setHillNumber(String hillNumber) {
+        this.hillNumber = hillNumber;
+    }
+
+    public BigDecimal getOcCycle() {
+        return ocCycle;
+    }
+
+    public void setOcCycle(BigDecimal ocCycle) {
+        this.ocCycle = ocCycle;
+    }
+
+    public BigDecimal getDailyOutput() {
+        return dailyOutput;
+    }
+
+    public void setDailyOutput(BigDecimal dailyOutput) {
+        this.dailyOutput = dailyOutput;
+    }
+
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
+    public Integer getCurrentVersionId() {
+        return currentVersionId;
+    }
+
+    public void setCurrentVersionId(Integer currentVersionId) {
+        this.currentVersionId = currentVersionId;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public Integer getCreatorId() {
+        return creatorId;
+    }
+
+    public void setCreatorId(Integer creatorId) {
+        this.creatorId = creatorId;
+    }
+
+    public Integer getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Integer projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getRfid() {
+        return rfid;
+    }
+
+    public void setRfid(String rfid) {
+        this.rfid = rfid;
+    }
+
+    public Integer getSettingLife() {
+        return settingLife;
+    }
+
+    public void setSettingLife(Integer settingLife) {
+        this.settingLife = settingLife;
+    }
+
+    public String getArea() {
+        return area;
+    }
+
+    public void setArea(String area) {
+        this.area = area;
+    }
+
+    public Integer getFactoryId() {
+        return factoryId;
+    }
+
+    public void setFactoryId(Integer factoryId) {
+        this.factoryId = factoryId;
+    }
+
+    public String getFactoryName() {
+        return factoryName;
+    }
+
+    public void setFactoryName(String factoryName) {
+        this.factoryName = factoryName;
+    }
+
+    public Integer getInitialModulus() {
+        return initialModulus;
+    }
+
+    public void setInitialModulus(Integer initialModulus) {
+        this.initialModulus = initialModulus;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "Mould{" +
+        "id=" + id +
+        ", modelNo=" + modelNo +
+        ", modelName=" + modelName +
+        ", waterGap=" + waterGap +
+        ", tonnage=" + tonnage +
+        ", hillNumber=" + hillNumber +
+        ", ocCycle=" + ocCycle +
+        ", dailyOutput=" + dailyOutput +
+        ", companyId=" + companyId +
+        ", currentVersionId=" + currentVersionId +
+        ", state=" + state +
+        ", isDelete=" + isDelete +
+        ", creatorId=" + creatorId +
+        ", projectId=" + projectId +
+        ", rfid=" + rfid +
+        ", settingLife=" + settingLife +
+        ", area=" + area +
+        ", factoryId=" + factoryId +
+        ", factoryName=" + factoryName +
+        ", initialModulus=" + initialModulus +
+        "}";
+    }
+}

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

@@ -0,0 +1,275 @@
+package com.hssx.cloudmodel.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-29
+ */
+@TableName("tb_project")
+public class Project extends Model<Project> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 项目主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 项目名称
+     */
+    @TableField("project_name")
+    private String projectName;
+
+    /**
+     * 项目编号
+     */
+    @TableField("project_no")
+    private String projectNo;
+
+    /**
+     * 开始时间
+     */
+    @TableField("start_time")
+    private LocalDateTime startTime;
+
+    /**
+     * 结束时间
+     */
+    @TableField("end_time")
+    private LocalDateTime endTime;
+
+    /**
+     * 评论内容
+     */
+    @TableField("content")
+    private String content;
+
+    /**
+     * 创建人id
+     */
+    @TableField("creator_id")
+    private Integer creatorId;
+
+    /**
+     * 创建人名字
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 是否删除，软删除操作
+     */
+    @TableField("is_delete")
+    private Integer isDelete;
+
+    /**
+     * 本项目公司id
+     */
+    @TableField("owner_company")
+    private Integer ownerCompany;
+
+    /**
+     * 本项目公司名称
+     */
+    @TableField("owner_company_name")
+    private String ownerCompanyName;
+
+    /**
+     * 客户方公司id
+     */
+    @TableField("customer_company")
+    private Integer customerCompany;
+
+    /**
+     * 客户方公司名称
+     */
+    @TableField("customer_company_name")
+    private String customerCompanyName;
+
+    /**
+     * 创建时间
+     */
+    @TableField("indate")
+    private LocalDateTime indate;
+
+    /**
+     * 负责人id
+     */
+    @TableField("charger_id")
+    private Integer chargerId;
+
+    /**
+     * 负责人名字
+     */
+    @TableField("charger")
+    private String charger;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getProjectNo() {
+        return projectNo;
+    }
+
+    public void setProjectNo(String projectNo) {
+        this.projectNo = projectNo;
+    }
+
+    public LocalDateTime getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(LocalDateTime startTime) {
+        this.startTime = startTime;
+    }
+
+    public LocalDateTime getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(LocalDateTime endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public Integer getCreatorId() {
+        return creatorId;
+    }
+
+    public void setCreatorId(Integer creatorId) {
+        this.creatorId = creatorId;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public Integer getOwnerCompany() {
+        return ownerCompany;
+    }
+
+    public void setOwnerCompany(Integer ownerCompany) {
+        this.ownerCompany = ownerCompany;
+    }
+
+    public String getOwnerCompanyName() {
+        return ownerCompanyName;
+    }
+
+    public void setOwnerCompanyName(String ownerCompanyName) {
+        this.ownerCompanyName = ownerCompanyName;
+    }
+
+    public Integer getCustomerCompany() {
+        return customerCompany;
+    }
+
+    public void setCustomerCompany(Integer customerCompany) {
+        this.customerCompany = customerCompany;
+    }
+
+    public String getCustomerCompanyName() {
+        return customerCompanyName;
+    }
+
+    public void setCustomerCompanyName(String customerCompanyName) {
+        this.customerCompanyName = customerCompanyName;
+    }
+
+    public LocalDateTime getIndate() {
+        return indate;
+    }
+
+    public void setIndate(LocalDateTime indate) {
+        this.indate = indate;
+    }
+
+    public Integer getChargerId() {
+        return chargerId;
+    }
+
+    public void setChargerId(Integer chargerId) {
+        this.chargerId = chargerId;
+    }
+
+    public String getCharger() {
+        return charger;
+    }
+
+    public void setCharger(String charger) {
+        this.charger = charger;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "Project{" +
+        "id=" + id +
+        ", projectName=" + projectName +
+        ", projectNo=" + projectNo +
+        ", startTime=" + startTime +
+        ", endTime=" + endTime +
+        ", content=" + content +
+        ", creatorId=" + creatorId +
+        ", creator=" + creator +
+        ", isDelete=" + isDelete +
+        ", ownerCompany=" + ownerCompany +
+        ", ownerCompanyName=" + ownerCompanyName +
+        ", customerCompany=" + customerCompany +
+        ", customerCompanyName=" + customerCompanyName +
+        ", indate=" + indate +
+        ", chargerId=" + chargerId +
+        ", charger=" + charger +
+        "}";
+    }
+}

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

@@ -0,0 +1,170 @@
+package com.hssx.cloudmodel.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-30
+ */
+@TableName("tb_project_file")
+public class ProjectFile extends Model<ProjectFile> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 项目文件主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 项目id
+     */
+    @TableField("project_id")
+    private Integer projectId;
+
+    /**
+     * 上传者id
+     */
+    @TableField("uploader_id")
+    private Integer uploaderId;
+
+    /**
+     * 上传者姓名
+     */
+    @TableField("uploader")
+    private String uploader;
+
+    /**
+     * 文件名
+     */
+    @TableField("file_name")
+    private String fileName;
+
+    /**
+     * 文件地址/服务器文件名
+     */
+    @TableField("url")
+    private String url;
+
+    /**
+     * 文件类型
+     */
+    @TableField("file_type")
+    private String fileType;
+
+    /**
+     * 文件大小
+     */
+    @TableField("file_size")
+    private String fileSize;
+
+    /**
+     * 上传时间
+     */
+    @TableField("indate")
+    private LocalDateTime indate;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Integer projectId) {
+        this.projectId = projectId;
+    }
+
+    public Integer getUploaderId() {
+        return uploaderId;
+    }
+
+    public void setUploaderId(Integer uploaderId) {
+        this.uploaderId = uploaderId;
+    }
+
+    public String getUploader() {
+        return uploader;
+    }
+
+    public void setUploader(String uploader) {
+        this.uploader = uploader;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getFileType() {
+        return fileType;
+    }
+
+    public void setFileType(String fileType) {
+        this.fileType = fileType;
+    }
+
+    public String getFileSize() {
+        return fileSize;
+    }
+
+    public void setFileSize(String fileSize) {
+        this.fileSize = fileSize;
+    }
+
+    public LocalDateTime getIndate() {
+        return indate;
+    }
+
+    public void setIndate(LocalDateTime indate) {
+        this.indate = indate;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "ProjectFile{" +
+        "id=" + id +
+        ", projectId=" + projectId +
+        ", uploaderId=" + uploaderId +
+        ", uploader=" + uploader +
+        ", fileName=" + fileName +
+        ", url=" + url +
+        ", fileType=" + fileType +
+        ", fileSize=" + fileSize +
+        ", indate=" + indate +
+        "}";
+    }
+}

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

@@ -0,0 +1,94 @@
+package com.hssx.cloudmodel.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-29
+ */
+@TableName("tb_project_user")
+public class ProjectUser extends Model<ProjectUser> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 项目id
+     */
+    @TableField("project_id")
+    private Integer projectId;
+
+    /**
+     * 用户id
+     */
+    @TableField("user_id")
+    private Integer userId;
+
+    /**
+     * 所属方
+     */
+    @TableField("subordinate")
+    private Integer subordinate;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Integer projectId) {
+        this.projectId = projectId;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public Integer getSubordinate() {
+        return subordinate;
+    }
+
+    public void setSubordinate(Integer subordinate) {
+        this.subordinate = subordinate;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "ProjectUser{" +
+        "id=" + id +
+        ", projectId=" + projectId +
+        ", userId=" + userId +
+        ", subordinate=" + subordinate +
+        "}";
+    }
+}

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

@@ -14,7 +14,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-07-26
+ * @since 2019-07-31
  */
 @TableName("tb_user")
 public class User extends Model<User> {
@@ -52,7 +52,7 @@ public class User extends Model<User> {
     private String mobile;
 
     /**
-     * (供应商)角色类型，0-项目经理 1-普通用户。(客户方)5-客服方领导，6-客户方普通人员
+     * 角色类型，-1-超级管理员 0-项目经理 1-普通用户。5-客服方领导，6-客户方普通人员
      */
     @TableField("role_type")
     private Integer roleType;
@@ -76,10 +76,10 @@ public class User extends Model<User> {
     private Integer sex;
 
     /**
-     * 部门编号
+     * 角色名（用户填写）
      */
-    @TableField("dep_no")
-    private String depNo;
+    @TableField("role_name")
+    private String roleName;
 
     /**
      * 工作状态
@@ -100,7 +100,7 @@ public class User extends Model<User> {
     private LocalDateTime indate;
 
     /**
-     * 用户头像
+     * token用户凭证
      */
     @TableField("head_imgurl")
     private String headImgurl;
@@ -112,7 +112,7 @@ public class User extends Model<User> {
     private String teamName;
 
     /**
-     * 所属方，0-供应商 1-客户方
+     * 所属方，-1-超级管理员,0-供应商 1-客户方
      */
     @TableField("subordinate_type")
     private Integer subordinateType;
@@ -190,12 +190,12 @@ public class User extends Model<User> {
         this.sex = sex;
     }
 
-    public String getDepNo() {
-        return depNo;
+    public String getRoleName() {
+        return roleName;
     }
 
-    public void setDepNo(String depNo) {
-        this.depNo = depNo;
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
     }
 
     public Integer getWorkState() {
@@ -263,7 +263,7 @@ public class User extends Model<User> {
         ", companyId=" + companyId +
         ", parentId=" + parentId +
         ", sex=" + sex +
-        ", depNo=" + depNo +
+        ", roleName=" + roleName +
         ", workState=" + workState +
         ", isDisable=" + isDisable +
         ", indate=" + indate +

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

@@ -0,0 +1,53 @@
+package com.hssx.cloudmodel.entity.vo;
+
+import com.hssx.cloudmodel.entity.Mould;
+import com.hssx.cloudmodel.entity.Project;
+import com.hssx.cloudmodel.entity.User;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 07 - 30 9:59
+ * Description:<描述>
+ * Version: 1.0
+ */
+public class ProjectVO extends Project {
+    private List<User> customUsers = new ArrayList<>();
+    private List<User> ownerUsers = new ArrayList<>();
+    private List<Mould> models = new ArrayList<>();
+
+    public List<User> getCustomUsers() {
+        return customUsers;
+    }
+
+    public void setCustomUsers(List<User> customUsers) {
+        this.customUsers = customUsers;
+    }
+
+    public List<User> getOwnerUsers() {
+        return ownerUsers;
+    }
+
+    public void setOwnerUsers(List<User> ownerUsers) {
+        this.ownerUsers = ownerUsers;
+    }
+
+    public List<Mould> getModels() {
+        return models;
+    }
+
+    public void setModels(List<Mould> models) {
+        this.models = models;
+    }
+
+    @Override
+    public String toString() {
+        return "ProjectVO{" +
+                "customUsers=" + customUsers +
+                ", ownerUsers=" + ownerUsers +
+                ", models=" + models +
+                '}';
+    }
+}

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

@@ -0,0 +1,30 @@
+package com.hssx.cloudmodel.entity.vo;
+
+import com.hssx.cloudmodel.entity.User;
+
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 07 - 27 17:31
+ * Description:<描述>
+ * Version: 1.0
+ */
+public class UserVO extends User {
+    private String companyName;
+    private String roleName;
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.hssx.cloudmodel.mapper;
+
+import com.hssx.cloudmodel.entity.Company;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-26
+ */
+public interface CompanyMapper extends BaseMapper<Company> {
+
+    List<Company> getListByKeyName(@Param("keyName") String keyName, @Param("start")Integer start, @Param("pageSize") Integer pageSize);
+
+    List<Company> selectIdAndNamelist();
+}

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

@@ -1,6 +1,6 @@
 package com.hssx.cloudmodel.mapper;
 
-import com.hssx.cloudmodel.entity.Role;
+import com.hssx.cloudmodel.entity.Mould;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-07-26
+ * @since 2019-07-30
  */
-public interface RoleMapper extends BaseMapper<Role> {
+public interface MouldMapper extends BaseMapper<Mould> {
 
 }

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

@@ -1,6 +1,6 @@
 package com.hssx.cloudmodel.mapper;
 
-import com.hssx.cloudmodel.entity.SysUser;
+import com.hssx.cloudmodel.entity.ProjectFile;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-07-25
+ * @since 2019-07-30
  */
-public interface SysUserMapper extends BaseMapper<SysUser> {
+public interface ProjectFileMapper extends BaseMapper<ProjectFile> {
 
 }

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

@@ -0,0 +1,28 @@
+package com.hssx.cloudmodel.mapper;
+
+import com.hssx.cloudmodel.entity.Project;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.vo.ProjectVO;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.PageUtil;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-27
+ */
+public interface ProjectMapper extends BaseMapper<Project> {
+
+    List<Project> getProjectListByUid(@Param("keyName") String keyName, @Param("currentUser") User currentUser);
+
+    ProjectVO getProjectById(@Param("id")Integer id);
+
+    List<User> getProjectUserById(@Param("id")Integer id);
+}

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

@@ -1,6 +1,6 @@
 package com.hssx.cloudmodel.mapper;
 
-import com.hssx.cloudmodel.entity.Company;
+import com.hssx.cloudmodel.entity.ProjectUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-07-26
+ * @since 2019-07-29
  */
-public interface CompanyMapper extends BaseMapper<Company> {
+public interface ProjectUserMapper extends BaseMapper<ProjectUser> {
 
 }

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

@@ -0,0 +1,21 @@
+package com.hssx.cloudmodel.mapper;
+
+import com.hssx.cloudmodel.entity.User;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hssx.cloudmodel.entity.vo.UserVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-26
+ */
+public interface UserMapper extends BaseMapper<User> {
+
+    List<UserVO> selectListByCondition(@Param("roleType") Integer roleType, @Param("companyId")Integer companyId,@Param("flag") Integer flag, @Param("user") User user, @Param("keyName") String keyName);
+}

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

@@ -3,6 +3,9 @@ package com.hssx.cloudmodel.service;
 import com.hssx.cloudmodel.entity.Company;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.PageUtil;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@ import com.hssx.cloudmodel.util.HttpRespMsg;
 public interface CompanyService extends IService<Company> {
 
     HttpRespMsg addAndUpdateRole(Company company, Integer flag);
+
+    HttpRespMsg pageList(PageUtil page, String keyName);
+
+    List<Company> getIdAndNamelist();
+
+    HttpRespMsg deleteById(Integer id);
 }

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

@@ -3,6 +3,7 @@ package com.hssx.cloudmodel.service;
 import com.hssx.cloudmodel.entity.Factory;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.PageUtil;
 
 /**
  * <p>
@@ -14,5 +15,9 @@ import com.hssx.cloudmodel.util.HttpRespMsg;
  */
 public interface FactoryService extends IService<Factory> {
 
-    HttpRespMsg addAndUpdateRole(Factory factory, Integer flag);
+    HttpRespMsg addAndUpdateFactory(Factory factory, Integer flag);
+
+    HttpRespMsg pageList(PageUtil page, String keyName);
+
+    HttpRespMsg deleteById(Integer id);
 }

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

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.service;
+
+import com.hssx.cloudmodel.entity.Mould;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-30
+ */
+public interface MouldService extends IService<Mould> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.service;
+
+import com.hssx.cloudmodel.entity.ProjectFile;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-30
+ */
+public interface ProjectFileService extends IService<ProjectFile> {
+
+}

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

@@ -0,0 +1,29 @@
+package com.hssx.cloudmodel.service;
+
+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.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.PageUtil;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-27
+ */
+public interface ProjectService extends IService<Project> {
+
+    HttpRespMsg addAndUpdateProject(Project project, Integer flag, User user,String userIds);
+
+    HttpRespMsg handOutProject(Project project, String userIds);
+
+    HttpRespMsg getList(String keyName,PageUtil page,User currentUser);
+
+    HttpRespMsg getUserByCompanyIdOrSubordinateType(User user);
+
+    HttpRespMsg getProjectDetail(Project project);
+}

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

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.service;
+
+import com.hssx.cloudmodel.entity.ProjectUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-29
+ */
+public interface ProjectUserService extends IService<ProjectUser> {
+
+}

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

@@ -3,6 +3,7 @@ package com.hssx.cloudmodel.service;
 import com.hssx.cloudmodel.entity.User;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.PageUtil;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -16,7 +17,9 @@ import javax.servlet.http.HttpServletRequest;
  */
 public interface UserService extends IService<User> {
 
-    HttpRespMsg addAndUpdateRole(User user, Integer flag);
+    HttpRespMsg addAndUpdateUser(User user, Integer flag);
 
     HttpRespMsg login(User user, HttpServletRequest request);
+
+    HttpRespMsg pageList(PageUtil page,Integer companyId,Integer flag,String keyName,User user,Integer roleType);
 }

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

@@ -2,14 +2,18 @@ package com.hssx.cloudmodel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.entity.Company;
-import com.hssx.cloudmodel.entity.Role;
+import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.mapper.CompanyMapper;
+import com.hssx.cloudmodel.mapper.UserMapper;
 import com.hssx.cloudmodel.service.CompanyService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -22,6 +26,8 @@ import org.springframework.stereotype.Service;
 public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements CompanyService {
     @Autowired
     CompanyMapper companyMapper;
+    @Autowired
+    UserMapper userMapper;
 
     @Override
     public HttpRespMsg addAndUpdateRole(Company company, Integer flag) {
@@ -42,4 +48,38 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         }
         return msg;
     }
+
+    @Override
+    public HttpRespMsg pageList(PageUtil page, String keyName) {
+        HttpRespMsg msg = new HttpRespMsg();
+        QueryWrapper<Company> qw = new QueryWrapper<>();
+        if(keyName !=null && !"".equals(keyName)){
+            qw.like("company_name", keyName);
+        }
+        Integer start = (page.getPageNum()-1)*page.getPageSize();
+        Integer count = companyMapper.selectCount(qw);
+        page.setTotal(count);
+        page.setPages(page.getTotal());
+        List<Company> list = companyMapper.getListByKeyName(keyName, start, page.getPageSize());
+        page.setList(list);
+        msg.data = page;
+        return msg;
+    }
+
+    @Override
+    public List<Company> getIdAndNamelist() {
+        return companyMapper.selectIdAndNamelist();
+    }
+
+    @Override
+    public HttpRespMsg deleteById(Integer id) {
+        HttpRespMsg msg = new HttpRespMsg();
+        Integer count = userMapper.selectCount(new QueryWrapper<User>().eq("company_id", id));
+        if (count > 0) {
+            msg.setError("该公司已被应用到用户中，暂不提供删除操作");
+        } else {
+            companyMapper.deleteById(id);
+        }
+        return msg;
+    }
 }

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

@@ -1,15 +1,20 @@
 package com.hssx.cloudmodel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.hssx.cloudmodel.entity.Company;
 import com.hssx.cloudmodel.entity.Factory;
 import com.hssx.cloudmodel.mapper.FactoryMapper;
 import com.hssx.cloudmodel.service.FactoryService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -24,7 +29,7 @@ public class FactoryServiceImpl extends ServiceImpl<FactoryMapper, Factory> impl
     @Autowired
     FactoryMapper factoryMapper;
     @Override
-    public HttpRespMsg addAndUpdateRole(Factory factory, Integer flag) {
+    public HttpRespMsg addAndUpdateFactory(Factory factory, Integer flag) {
         HttpRespMsg msg = new HttpRespMsg();
         if (flag == 0) {
             //添加公司
@@ -42,4 +47,23 @@ public class FactoryServiceImpl extends ServiceImpl<FactoryMapper, Factory> impl
         }
         return msg;
     }
+
+    @Override
+    public HttpRespMsg pageList(PageUtil page, String keyName) {
+        HttpRespMsg msg = new HttpRespMsg();
+        QueryWrapper<Factory> qw = new QueryWrapper<>();
+        if(keyName !=null && !"".equals(keyName)){
+            qw.like("factory_name",keyName);
+        }
+        PageHelper.startPage(page.getPageNum(),page.getPageSize());
+        List<Factory> factories = factoryMapper.selectList(qw);
+        PageInfo<Factory>pageInfos = new PageInfo<>(factories);
+        msg.data = pageInfos;
+        return msg;
+    }
+    //后续模具天机时需要重写该方法
+    @Override
+    public HttpRespMsg deleteById(Integer id) {
+        return null;
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.hssx.cloudmodel.service.impl;
+
+import com.hssx.cloudmodel.entity.Mould;
+import com.hssx.cloudmodel.mapper.MouldMapper;
+import com.hssx.cloudmodel.service.MouldService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-30
+ */
+@Service
+public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements MouldService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.hssx.cloudmodel.service.impl;
+
+import com.hssx.cloudmodel.entity.ProjectFile;
+import com.hssx.cloudmodel.mapper.ProjectFileMapper;
+import com.hssx.cloudmodel.service.ProjectFileService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-30
+ */
+@Service
+public class ProjectFileServiceImpl extends ServiceImpl<ProjectFileMapper, ProjectFile> implements ProjectFileService {
+
+}

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

@@ -0,0 +1,169 @@
+package com.hssx.cloudmodel.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.hssx.cloudmodel.entity.Company;
+import com.hssx.cloudmodel.entity.Project;
+import com.hssx.cloudmodel.entity.ProjectUser;
+import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.vo.ProjectVO;
+import com.hssx.cloudmodel.mapper.CompanyMapper;
+import com.hssx.cloudmodel.mapper.ProjectMapper;
+import com.hssx.cloudmodel.mapper.ProjectUserMapper;
+import com.hssx.cloudmodel.mapper.UserMapper;
+import com.hssx.cloudmodel.service.ProjectService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.ListUtil;
+import com.hssx.cloudmodel.util.PageUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.jws.soap.SOAPBinding;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-27
+ */
+@Service
+public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> implements ProjectService {
+
+    @Autowired
+    ProjectMapper projectMapper;
+    @Autowired
+    ProjectUserMapper projectUserMapper;
+    @Autowired
+    UserMapper userMapper;
+    @Autowired
+    CompanyMapper companyMapper;
+
+    @Override
+    public HttpRespMsg addAndUpdateProject(Project project, Integer flag, User user,String userIds) {
+        HttpRespMsg msg = new HttpRespMsg();
+        if(user != null){
+            QueryWrapper<Project> qw = new QueryWrapper<>();
+            qw.orderByDesc("id").last("limit 1");
+            Project lastProject = projectMapper.selectOne(qw);
+            if (flag == 0) {
+                synchronized (this) {
+                    int count = 1;
+                    if (lastProject != null) {
+                        //YMXM201903220001
+                        String numStr = lastProject.getProjectNo().substring(13);
+                        int num = Integer.valueOf(numStr).intValue();
+                        count += num;
+                    }
+                    long time = System.currentTimeMillis();
+                    Company company = companyMapper.selectById(user.getCompanyId());
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+                    String seq = sdf.format(time) + String.format("%04d", count);
+                    project.setCreatorId(user.getId());
+                    project.setCreator(user.getUsername());
+                    project.setOwnerCompany(user.getCompanyId());
+                    project.setOwnerCompanyName(company.getCompanyName());
+                    project.setProjectNo("YMXM"+seq);
+                    project.setCreatorId(user.getId());
+                    project.setCreator(user.getUsername());
+                    projectMapper.insert(project);
+                    //分配人员
+                    this.handOutProject(project, userIds);
+                }
+            }else if(flag == 1){
+                projectMapper.updateById(project);
+                //删除之前分配的人员
+                QueryWrapper<ProjectUser> qwPro = new QueryWrapper<>();
+                qwPro.eq("project_id",project.getId());
+                projectUserMapper.delete(qwPro);
+                //再次重新分配
+                this.handOutProject(project, userIds);
+            }
+        }else{
+            msg.setError("当前角色涉及权限问题，请重新登录");
+        }
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg handOutProject(Project project, String userIds) {
+        HttpRespMsg msg = new HttpRespMsg();
+        Project pro = projectMapper.selectById(project.getId());
+        List<Integer> ids = new ArrayList<>();
+        if(userIds != null && userIds != ""){
+            List<String> list = ListUtil.convertLongIdsArrayToList(userIds);
+            if(list().size()>0){
+                for(String id:list){
+                    User user = userMapper.selectById(id);
+                    ProjectUser projectUser = new ProjectUser();
+                    projectUser.setId(Integer.parseInt(id));
+                    projectUser.setProjectId(project.getId());
+                    projectUser.setSubordinate(user.getSubordinateType());
+                    projectUserMapper.insert(projectUser);
+                }
+            }
+        }else{
+            msg.setError("用户id不能为null和空");
+        }
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg getList(String keyName,PageUtil page,User currentUser) {
+        HttpRespMsg msg = new HttpRespMsg();
+        if(currentUser != null){
+            PageHelper.startPage(page.getPageNum(),page.getPageSize());
+            List<Project> projects = projectMapper.getProjectListByUid(keyName,currentUser);
+            PageInfo<Project> pageInfos = new PageInfo<>(projects);
+            msg.data = pageInfos;
+        }else{
+            msg.setError("当前用户不存，或涉及到权限问题，请重新登录");
+        }
+        QueryWrapper<Project> qw = new QueryWrapper<>();
+        qw.select("project_name", "creator","charger","indate");
+        if(keyName != null){
+            qw.like("project_name",keyName);
+        }
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg getUserByCompanyIdOrSubordinateType(User user) {
+        HttpRespMsg msg = new HttpRespMsg();
+        List<User> users = new ArrayList<>();
+        QueryWrapper<User>qw = new QueryWrapper<>();
+        if(user.getCompanyId() != null){
+            qw.eq("company_id", user.getCompanyId());
+        }else if(user.getSubordinateType() != null){
+            qw.eq("subordinate_type", user.getSubordinateType());
+        }
+        users = userMapper.selectList(qw);
+        msg.data = users;
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg getProjectDetail(Project project) {
+        HttpRespMsg msg = new HttpRespMsg();
+        ProjectVO vo = projectMapper.getProjectById(project.getId());
+        List<User> users = projectMapper.getProjectUserById(project.getId());
+        //处理users按照客户呼和供应商分组
+        for (User user : users) {
+            if(user.getSubordinateType()==0){
+                //供应商
+                vo.getOwnerUsers().add(user);
+            }else if(user.getSubordinateType()==1){
+                //客户
+                vo.getCustomUsers().add(user);
+            }
+        }
+        msg.data = vo;
+        return msg;
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.hssx.cloudmodel.service.impl;
+
+import com.hssx.cloudmodel.entity.ProjectUser;
+import com.hssx.cloudmodel.mapper.ProjectUserMapper;
+import com.hssx.cloudmodel.service.ProjectUserService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-29
+ */
+@Service
+public class ProjectUserServiceImpl extends ServiceImpl<ProjectUserMapper, ProjectUser> implements ProjectUserService {
+
+}

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

@@ -1,19 +1,22 @@
 package com.hssx.cloudmodel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hssx.cloudmodel.constant.Constant;
-import com.hssx.cloudmodel.entity.Role;
-import com.hssx.cloudmodel.entity.SysUser;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.mapper.UserMapper;
 import com.hssx.cloudmodel.service.UserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.MD5Util;
+import com.hssx.cloudmodel.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.UUID;
 
 /**
  * <p>
@@ -40,10 +43,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         if (count > 0) {
             User newUser = userMapper.selectOne(qw);
             //验证密码是否正确
-            if (user.getPassword().equals(MD5Util.getPassword(user.getPassword()))) {
-                user.setPassword("");
-                request.getSession().setAttribute(Constant.COMMON_USER, user);
-                msg.data = user;
+            if (MD5Util.getPassword(user.getPassword()).equals(newUser.getPassword())) {
+                newUser.setPassword("");
+                msg.data = newUser;
             } else {
                 msg.setError("密码错误");
             }
@@ -54,7 +56,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     }
 
     @Override
-    public HttpRespMsg addAndUpdateRole(User user, Integer flag) {
+    public HttpRespMsg pageList(PageUtil page, Integer companyId, Integer flag, String keyName, User user, Integer roleType) {
+        HttpRespMsg msg = new HttpRespMsg();
+        PageHelper.startPage(page.getPageNum(), page.getPageSize());
+        List<UserVO> users = userMapper.selectListByCondition(roleType,companyId,flag, user, keyName);
+        PageInfo<UserVO> pageInfos = new PageInfo<>(users);
+        msg.data = pageInfos;
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg addAndUpdateUser(User user, Integer flag) {
         HttpRespMsg msg = new HttpRespMsg();
         if (flag == 0) {
             //添加角色
@@ -66,6 +78,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             } else {
                 //创建账号默认密码"000000"
                 user.setPassword(MD5Util.getPassword("000000"));
+                user.setHeadImgurl(UUID.randomUUID().toString().replaceAll("-", ""));
+                //获取角色所属的团体
+//                Role role = roleMapper.selectById(user.getRoleType());
+//                if("客户".equals(role.getSubordinate())){
+//                    user.setSubordinateType(1);
+//                }else if("供应商".equals(role.getSubordinate())){
+//                    user.setSubordinateType(0);
+//                }
+//                user.setTeamName(role.getSubordinate());
                 userMapper.insert(user);
             }
         } else if (flag == 1) {

model/cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("tb_factory");
+        strategy.setInclude("tb_user");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

cloud-model/src/main/java/com/hssx/cloudmodel/util/ListUtil.java

@@ -0,0 +1,130 @@
+package com.hssx.cloudmodel.util;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 07 - 25 16:56
+ * Description:<描述>处理字符串转成集合的
+ * Version: 1.0
+ */
+
+public class ListUtil {
+	/**
+	 * 
+	 * @param idStr 1,2,3,4,5字符串
+	 * @return List<Long>
+	 */
+	public static List<Long> convertIdsArrayToList(String idStr) {
+		String[] array = idStr.split(",");
+		List<Long> ids = new ArrayList<Long>();
+		for (String a : array) {
+			if (a != null && a.length() > 0) {
+				ids.add(Long.valueOf(a));
+			}
+		}
+		return ids;
+	}
+	/**
+	 * Long
+	 * @param idStr  1,2,3,4,5字符串
+	 * @return
+	 */
+	public static List<String> convertLongIdsArrayToList(String idStr) {
+		String[] array = idStr.split(",");
+		List<String> ids = new ArrayList<String>();
+		for (String a : array) {
+			if (a != null && a.length() > 0) {
+				ids.add(a);
+			}
+		}
+		return ids;
+	}
+
+	public static List<Integer> extractIdFromList(List object, String key) {
+		List<Integer> list = new ArrayList<Integer>();
+        for (Object obj : object) {
+            // 得到类对象
+            Class userCla = (Class) obj.getClass();
+            /* 得到类中的所有属性集合 */
+            Field[] fs = userCla.getDeclaredFields();
+            for (int i = 0; i < fs.length; i++) {
+                Field f = fs[i];
+                f.setAccessible(true); // 设置些属性是可以访问的
+                try {
+                    if (f.getName().equals(key)) {
+                        list.add((Integer)f.get(obj));
+                    }
+                } catch (IllegalArgumentException e) {
+                    e.printStackTrace();
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return list;
+	}
+	
+	
+	public static List<String> extractNameFromList(List object, String key) {
+		List<String> list = new ArrayList<String>();
+		for (Object obj : object) {
+			// 得到类对象
+			Class userCla = (Class) obj.getClass();
+			/* 得到类中的所有属性集合 */
+			Field[] fs = userCla.getDeclaredFields();
+			for (int i = 0; i < fs.length; i++) {
+				Field f = fs[i];
+				f.setAccessible(true); // 设置些属性是可以访问的
+				try {
+					if (f.getName().equals(key)) {
+						list.add((String)f.get(obj));
+					}
+				} catch (IllegalArgumentException e) {
+					e.printStackTrace();
+				} catch (IllegalAccessException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		return list;
+	}
+	
+	public static List<Integer> addList(String ids,List<Integer> idList){
+		String[] joinStr = ids.split(",");
+		boolean isCf = false;
+		for(String id : joinStr){
+			if (id != null && id.length() > 0) {
+				for(int i = 0;i<idList.size();i++){
+					if(Integer.valueOf(id).intValue() != idList.get(i).intValue()){
+						isCf = false;
+					}else{
+						isCf = true;
+						break;
+					}
+				}
+				if(!isCf){
+					idList.add(Integer.valueOf(id));
+				}
+			}
+		}
+		
+		return idList;
+	}
+	
+	//去重
+	public static List removeDuplicateData(List list) {
+		HashSet set = new HashSet();
+		set.addAll(list);
+		list.clear();
+		list.addAll(set);
+		return list;
+	}
+	
+	public static void main(String[] args) {
+		String str = "123|456";
+		System.out.println(str.contains("|"));
+	}
+}

model/cloud-model/src/main/java/com/hssx/cloudmodel/util/MD5Util.java

@@ -2,6 +2,8 @@ package com.hssx.cloudmodel.util;
 
 import org.springframework.util.DigestUtils;
 
+import java.util.UUID;
+
 /**
  * Author: 吴涛涛 cuiyi@itany.com
  * Date : 2019 - 07 - 25 16:56
@@ -17,5 +19,6 @@ public class MD5Util {
     public static void main(String[] args) {
         String password = "000000";
         System.out.println(MD5Util.getPassword(password));
+        System.out.println(UUID.randomUUID().toString().replaceAll("-", ""));;
     }
 }

cloud-model/src/main/java/com/hssx/cloudmodel/util/PageUtil.java

@@ -0,0 +1,58 @@
+package com.hssx.cloudmodel.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 07 - 27 9:25
+ * Description:<描述>
+ * Version: 1.0
+ */
+public class PageUtil<T> {
+    private Integer pageNum = 1;
+    private Integer total;
+    private Integer pageSize = 10;
+    private Integer pages;
+    private List<T> list = new ArrayList<>();
+
+    public Integer getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(Integer pageNum) {
+        this.pageNum = pageNum;
+    }
+
+    public Integer getTotal() {
+        return total;
+    }
+
+    public void setTotal(Integer total) {
+        this.total = total;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Integer getPages() {
+        return pages;
+    }
+
+    public void setPages(Integer total) {
+        this.pages = total % this.pageSize == 0 ? total / this.pageSize : total / this.pageSize + 1;;
+    }
+
+    public List<T> getList() {
+        return list;
+    }
+
+    public void setList(List<T> list) {
+        this.list = list;
+    }
+}

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

@@ -21,7 +21,7 @@ spring.datasource.password=p011430seya10
 mybatis.mapper-locations=mappers/*Mapper.xml
 mybatis.type-aliases-package=com.hssx.cloudmodel.entity/*
 # ¿ØÖÆ̨Êä³öSQLÓï¾ä
-logging.level.com.hssx.cloud.dao.*=debug
+logging.level.com.hssx.cloudmodel.mapper = debug
 # ####################################################################################################
 #ÅäÖÃSession
 spring.session.store-type=none

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

@@ -0,0 +1,35 @@
+<?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" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, company_name, company_address
+    </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>
+    <select id="selectIdAndNamelist" resultMap="BaseResultMap">
+        select
+          id, company_name
+        from
+          tb_company
+    </select>
+
+</mapper>

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

@@ -0,0 +1,34 @@
+<?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="hill_number" property="hillNumber" />
+        <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" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, model_no, model_name, water_gap, tonnage, hill_number, 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
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,23 @@
+<?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>

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

@@ -0,0 +1,102 @@
+<?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="customer_company" property="customerCompany" />
+        <result column="customer_company_name" property="customerCompanyName" />
+        <result column="indate" property="indate" />
+        <result column="charger_id" property="chargerId" />
+        <result column="charger" property="charger" />
+    </resultMap>
+
+    <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="customer_company" property="customerCompany" />
+        <result column="customer_company_name" property="customerCompanyName" />
+        <result column="indate" property="indate" />
+        <result column="charger_id" property="chargerId" />
+        <result column="charger" property="charger" />
+        <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>
+
+    <!-- 通用查询结果列 -->
+    <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, customer_company, customer_company_name, indate, charger_id, charger
+    </sql>
+
+    <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.customer_company customer_company,
+        p.customer_company_name customer_company_name,p.charger charger,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.customer_company customer_company, p.customer_company_name customer_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>

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

@@ -1,17 +1,18 @@
 <?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">
+<mapper namespace="com.hssx.cloudmodel.mapper.ProjectUserMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.Company">
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.ProjectUser">
         <id column="id" property="id" />
-        <result column="company_name" property="companyName" />
-        <result column="company_address" property="companyAddress" />
+        <result column="project_id" property="projectId" />
+        <result column="user_id" property="userId" />
+        <result column="subordinate" property="subordinate" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_name, company_address
+        id, project_id, user_id, subordinate
     </sql>
 
 </mapper>

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

@@ -0,0 +1,82 @@
+<?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="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>
+
+    <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,
+        r.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.role_name role_name,u.subordinate_type subordinate_type
+        FROM
+        tb_user AS u
+        LEFT JOIN tb_company c
+        ON u.company_id = c.`id`
+        LEFT JOIN tb_role r
+        ON r.`id` = u.`role_type`
+        <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="roleType != -2">
+                AND  u.role_type = #{roleType}
+            </if>
+            <if test="companyId != -1">
+                AND  u.company_id = #{companyId}
+            </if>
+        </where>
+        Order by u.id desc
+    </select>
+</mapper>

cloud-model/src/test/java/com/hssx/cloudmodel/CloudModelApplicationTests.java

@@ -0,0 +1,26 @@
+package com.hssx.cloudmodel;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.List;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class CloudModelApplicationTests {
+//    @Autowired
+//    private RoleService roleService;
+//    @Test
+//    public void contextLoads() {
+//        //mybatis-plus只查询特定字段的测试
+//        QueryWrapper<Role> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.select("id", "role_name");
+//        List<Role> list = roleService.list(queryWrapper);
+//        System.out.println(list);
+//    }
+
+}

cloud-socket/.classpath

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v9.0"/>
+	<classpathentry kind="output" path="build/classes"/>
+</classpath>

cloud-socket/.project

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>cloud-socket</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>

cloud-socket/.settings/.jsdtscope

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="WebContent"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>

cloud-socket/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding//src/com/tenpay=GBK

cloud-socket/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,12 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7

cloud-socket/.settings/org.eclipse.wst.common.component

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="JSKBT">
+        <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+        <property name="context-root" value="JSKBT"/>
+        <property name="java-output-path" value="/JSKBT/build/classes"/>
+    </wb-module>
+</project-modules>

cloud-socket/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <runtime name="Apache Tomcat v7.0"/>
+  <fixed facet="java"/>
+  <fixed facet="wst.jsdt.web"/>
+  <fixed facet="jst.web"/>
+  <installed facet="java" version="1.7"/>
+  <installed facet="jst.web" version="3.0"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>

cloud-socket/.settings/org.eclipse.wst.jsdt.ui.superType.container

@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary

cloud-socket/.settings/org.eclipse.wst.jsdt.ui.superType.name

@@ -0,0 +1 @@
+Window

cloud-socket/WebContent/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+