后勤平台 修改数据库连接 添加公司管理的增删改查 修改用户mapper 大小写问题

@@ -47,9 +47,9 @@ spring:
         #username=CGOETL
         #password=1q2w3e4r
         #spring datasource mysql，注意编码配置，缺少数据库编码配置容易引起中文入库乱码
-        url: jdbc:mysql://127.0.0.1:3307/statistics?useUnicode=true&characterEncoding=utf8
-        username: root
-        password:
+        url: jdbc:mysql://118.31.66.166:3306/HQPT_USER?useUnicode=true&characterEncoding=utf8
+        username: 110
+        password: QAHqCJf2kFYCLirM
         driver-class-name: com.mysql.jdbc.Driver
         max-idle: 10
         max-wait: 10000
@@ -121,4 +121,4 @@ logging:
   #日志配置,输出到文本，
 #Java Web Token 时效时间,单位秒
 jwt:
-  max-alive: 300
+  max-alive: 30000

+package com.tianbo.warehouse.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.annotation.LogAnnotation;
+import com.tianbo.warehouse.controller.response.ResultJson;
+import com.tianbo.warehouse.model.Company;
+import com.tianbo.warehouse.service.CompanyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping("/company")
+public class CompanyController {
+
+    @Autowired
+    CompanyService companyService;
+
+    @GetMapping("/list")
+    public PageInfo<Company> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
+                                             int pageNum,
+                                  @RequestParam(value = "pageSize",required = false,defaultValue = "5")
+                                             int pageSize){
+        return companyService.findAll(pageNum,pageSize);
+
+    }
+
+    @LogAnnotation(moduleName = "公司管理",operate = "公司添加")
+    @PostMapping("/add")
+    public ResultJson add(@RequestBody Company company){
+
+        int i =companyService.insertSelective(company);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","添加成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "公司管理",operate = "公司修改")
+    @PutMapping("/edit")
+    @ResponseBody
+    public ResultJson edit(@RequestBody @Valid Company company){
+
+        int i =companyService.updateByPrimaryKeySelective(company);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","修改成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "公司管理",operate = "公司删除")
+    @DeleteMapping("/del")
+    public ResultJson reomve(@RequestBody Company company, HttpServletRequest request, HttpServletResponse response){
+
+        int i =companyService.deleteByPrimaryKey(company.getCompanyId());
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","修改成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "公司管理",operate = "公司批量删除")
+    @GetMapping("/batchremove")
+    public ResultJson reomve(String ids, HttpServletRequest request, HttpServletResponse response){
+
+        ResultJson resultJson = new ResultJson();
+
+        if (companyService.deleteByPrimaryKey(ids)>0){
+            resultJson = new ResultJson("200","修改成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+}

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.Company;
+
+import java.util.List;
+
+public interface CompanyMapper {
+    int deleteByPrimaryKey(String companyId);
+
+    int insert(Company record);
+
+    int insertSelective(Company record);
+
+    Company selectByPrimaryKey(String companyId);
+
+    int updateByPrimaryKeySelective(Company record);
+
+    int updateByPrimaryKey(Company record);
+
+    List<Company> findAll();
+}
\ No newline at end of file

+package com.tianbo.warehouse.model;
+
+import java.util.Date;
+
+public class Company {
+    private String companyId;
+
+    private String companyName;
+
+    private String groupId;
+
+    private Date creatTime;
+
+    private String companyStatus;
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId == null ? null : companyId.trim();
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName == null ? null : companyName.trim();
+    }
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId == null ? null : groupId.trim();
+    }
+
+    public Date getCreatTime() {
+        return creatTime;
+    }
+
+    public void setCreatTime(Date creatTime) {
+        this.creatTime = creatTime;
+    }
+
+    public String getCompanyStatus() {
+        return companyStatus;
+    }
+
+    public void setCompanyStatus(String companyStatus) {
+        this.companyStatus = companyStatus == null ? null : companyStatus.trim();
+    }
+}
\ No newline at end of file

+package com.tianbo.warehouse.service;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.model.Company;
+
+public interface CompanyService {
+
+    PageInfo<Company> findAll(int pageNum, int pageSize);
+
+    int insertSelective(Company company);
+
+    int updateByPrimaryKeySelective(Company company);
+
+    int deleteByPrimaryKey(String companyId);
+
+}

+package com.tianbo.warehouse.service.imp;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.dao.CompanyMapper;
+import com.tianbo.warehouse.model.Company;
+import com.tianbo.warehouse.service.CompanyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class CompanyServiceImp implements CompanyService {
+
+    @Autowired
+    CompanyMapper companyMapper;
+
+    @Override
+    public PageInfo<Company> findAll(int pageNum, int pageSize) {
+        Page<Company> page =  PageHelper.startPage(pageNum,pageSize);
+        List<Company> list = companyMapper.findAll();
+        PageInfo<Company> result = new PageInfo<>(list);
+        return result;
+    }
+
+    @Override
+    public int insertSelective(Company company) {
+        company.setCompanyId(UUID.randomUUID().toString());
+        company.setCreatTime(new Date());
+        return companyMapper.insertSelective(company);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(Company company) {
+        company.setCreatTime(new Date());
+        return companyMapper.updateByPrimaryKeySelective(company);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(String companyId) {
+        if (companyId.contains(",")){
+            try {
+                String[] split = companyId.split(",");
+                for (int i=0; i<split.length; i++){
+                    companyMapper.deleteByPrimaryKey(split[i]);
+                }
+                return 1;
+            }catch (Exception e){
+                e.printStackTrace();
+                return 0;
+            }
+        }else {
+            return companyMapper.deleteByPrimaryKey(companyId);
+        }
+    }
+}

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
 <generatorConfiguration>
     <!-- 数据库驱动:选择你的本地硬盘上面的数据库驱动包-->
-    <classPathEntry  location="/Users/mrz/Downloads/mybatis-generator-core-1.3.2/lib/mysql-connector-java-5.1.25-bin.jar"/>
+    <classPathEntry  location="/Users/shenhailong/.m2/repository/mysql/mysql-connector-java/5.1.30/mysql-connector-java-5.1.30.jar"/>
     <!--<classPathEntry  location="/Users/mrz/Documents/maven/ojdbc6.jar"/>-->
     <context id="DB2Tables"  targetRuntime="MyBatis3">
         <commentGenerator>
@@ -14,9 +14,9 @@
         </commentGenerator>
         <!--数据库链接URL，用户名、密码 -->
         <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-                            connectionURL="jdbc:mysql://127.0.0.1:3307/statistics"
-                            userId="root"
-                            password="">
+                            connectionURL="jdbc:mysql://118.31.66.166:3306/HQPT_USER"
+                            userId="110"
+                            password="QAHqCJf2kFYCLirM">
         </jdbcConnection>
         <!--<jdbcConnection driverClass="oracle.jdbc.driver.OracleDriver"-->
                         <!--connectionURL="jdbc:oracle:thin:@10.50.3.68:1521:CGODW"-->
@@ -45,6 +45,6 @@
             <property name="enableSubPackages" value="true"/>
         </javaClientGenerator>
         <!-- 要生成的表 tableName是数据库中的表名或视图名 domainObjectName是实体类名-->
-        <table tableName="attachment" domainObjectName="Attachment" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>
+        <table tableName="company" domainObjectName="company" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>
     </context>
 </generatorConfiguration>
\ No newline at end of file

+<?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.tianbo.warehouse.dao.CompanyMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.Company" >
+    <id column="company_id" property="companyId" jdbcType="VARCHAR" />
+    <result column="company_name" property="companyName" jdbcType="VARCHAR" />
+    <result column="group_id" property="groupId" jdbcType="VARCHAR" />
+    <result column="creat_time" property="creatTime" jdbcType="TIMESTAMP" />
+    <result column="company_status" property="companyStatus" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    company_id, company_name, group_id, creat_time, company_status
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from company
+    where company_id = #{companyId,jdbcType=VARCHAR}
+  </select>
+
+  <select id="findAll" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from company ORDER BY company_id
+  </select>
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from company
+    where company_id = #{companyId,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.Company" >
+    insert into company (company_id, company_name, group_id, 
+      creat_time, company_status)
+    values (#{companyId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, 
+      #{creatTime,jdbcType=TIMESTAMP}, #{companyStatus,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.Company" >
+    insert into company
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="companyId != null" >
+        company_id,
+      </if>
+      <if test="companyName != null" >
+        company_name,
+      </if>
+      <if test="groupId != null" >
+        group_id,
+      </if>
+      <if test="creatTime != null" >
+        creat_time,
+      </if>
+      <if test="companyStatus != null" >
+        company_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="companyName != null" >
+        #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="groupId != null" >
+        #{groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="creatTime != null" >
+        #{creatTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="companyStatus != null" >
+        #{companyStatus,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.Company" >
+    update company
+    <set >
+      <if test="companyName != null" >
+        company_name = #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="groupId != null" >
+        group_id = #{groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="creatTime != null" >
+        creat_time = #{creatTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="companyStatus != null" >
+        company_status = #{companyStatus,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where company_id = #{companyId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.Company" >
+    update company
+    set company_name = #{companyName,jdbcType=VARCHAR},
+      group_id = #{groupId,jdbcType=VARCHAR},
+      creat_time = #{creatTime,jdbcType=TIMESTAMP},
+      company_status = #{companyStatus,jdbcType=VARCHAR}
+    where company_id = #{companyId,jdbcType=VARCHAR}
+  </update>
+
+</mapper>
\ No newline at end of file

@@ -35,8 +35,8 @@
     FROM role R
     LEFT JOIN role_permission RP ON R.role_id = RP.role_id
     LEFT JOIN permission P ON RP.permission_id = P.permission_id
-    WHERE r.role_id=#{roleId,jdbcType=INTEGER}
-    ORDER BY P.ismenu,P.name,p.permission_order DESC
+    WHERE R.role_id=#{roleId,jdbcType=INTEGER}
+    ORDER BY P.ismenu,P.name,P.permission_order DESC
   </select>
   <select id="getAllMenus" resultMap="BaseResultMap" >
     SELECT

@@ -52,7 +52,7 @@
   <select id="selectAllUser" resultMap="SecurityResult" parameterType="com.tianbo.warehouse.model.USERS" >
     select
     <include refid="user_List" />
-    from USERS
+    from users
     WHERE  1=1
     <if test="username != null" >
      and  username = #{username,jdbcType=VARCHAR}