部门管理

@@ -32,12 +32,12 @@ spring:
   #eureka主机名，会在控制页面中显示
   #eureka主机名，会在控制页面中显示
   #DEV环境关闭注册。
   #DEV环境关闭注册。
     features:
     features:
-      enabled: false
+      enabled: true
     discovery:
     discovery:
-      enabled: false
+      enabled: true
     service-registry:
     service-registry:
       auto-registration:
       auto-registration:
-        enabled: false
+        enabled: true
 
 
   datasource:
   datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         type: com.alibaba.druid.pool.DruidDataSource
@@ -85,7 +85,7 @@ eureka:
   client:
   client:
     #eureka注册中心服务器地址
     #eureka注册中心服务器地址
     service-url:
     service-url:
-      defaultZone: http://10.50.3.82:19527/eureka/
+      defaultZone: http://192.168.1.53:12345/eureka/
     registry-fetch-interval-seconds:  30
     registry-fetch-interval-seconds:  30
     lease-renewal-interval-in-seconds: 15
     lease-renewal-interval-in-seconds: 15
     lease-expiration-duration-in-seconds: 45
     lease-expiration-duration-in-seconds: 45

+package com.tianbo.warehouse.controller.staff;
+
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.annotation.LogAnnotation;
+import com.tianbo.warehouse.controller.response.ResultJson;
+import com.tianbo.warehouse.model.StaffSecurityInspection;
+import com.tianbo.warehouse.service.satff.StaffSecurityInspectionService;
+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("/stall")
+public class StaffSecurityInspectionController {
+
+    @Autowired
+    StaffSecurityInspectionService staffSecurityInspectionService;
+
+    @GetMapping("/list")
+    public PageInfo<StaffSecurityInspection> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
+                                          int pageNum,
+                                                  @RequestParam(value = "pageSize",required = false,defaultValue = "5")
+                                          int pageSize){
+        return staffSecurityInspectionService.findAll(pageNum,pageSize);
+
+    }
+
+    @LogAnnotation(moduleName = "职工公寓安全巡视管理",operate = "职工公寓安全巡视添加")
+    @PostMapping("/add")
+    public ResultJson add(@RequestBody StaffSecurityInspection staffSecurityInspection){
+
+        int i =staffSecurityInspectionService.insertSelective(staffSecurityInspection);
+
+        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 StaffSecurityInspection staffSecurityInspection){
+
+        int i =staffSecurityInspectionService.updateByPrimaryKeySelective(staffSecurityInspection);
+
+        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 StaffSecurityInspection staffSecurityInspection, HttpServletRequest request, HttpServletResponse response){
+
+        int i =staffSecurityInspectionService.deleteByPrimaryKey(staffSecurityInspection.getSecurityInspectionId());
+
+        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 (staffSecurityInspectionService.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.StaffSecurityInspection;
+
+import java.util.List;
+
+public interface StaffSecurityInspectionMapper {
+    int deleteByPrimaryKey(String securityInspectionId);
+
+    int insert(StaffSecurityInspection record);
+
+    int insertSelective(StaffSecurityInspection record);
+
+    StaffSecurityInspection selectByPrimaryKey(String securityInspectionId);
+
+    int updateByPrimaryKeySelective(StaffSecurityInspection record);
+
+    int updateByPrimaryKey(StaffSecurityInspection record);
+
+    List<StaffSecurityInspection> findAll();
+}

+package com.tianbo.warehouse.model;
+
+import java.util.Date;
+
+public class StaffSecurityInspection {
+    private String securityInspectionId;
+
+    private String securityInspectionName;
+
+    private Date securityInspectionDate;
+
+    private String fireName;
+
+    private String securityElectro;
+
+    private String fireproofing;
+
+    private String doubtfulPerson;
+
+    private String violationsCar;
+
+    private String builders;
+
+    private Integer userId;
+
+    private String realname;
+
+    private Date optTime;
+
+    public String getSecurityInspectionId() {
+        return securityInspectionId;
+    }
+
+    public void setSecurityInspectionId(String securityInspectionId) {
+        this.securityInspectionId = securityInspectionId == null ? null : securityInspectionId.trim();
+    }
+
+    public String getSecurityInspectionName() {
+        return securityInspectionName;
+    }
+
+    public void setSecurityInspectionName(String securityInspectionName) {
+        this.securityInspectionName = securityInspectionName == null ? null : securityInspectionName.trim();
+    }
+
+    public Date getSecurityInspectionDate() {
+        return securityInspectionDate;
+    }
+
+    public void setSecurityInspectionDate(Date securityInspectionDate) {
+        this.securityInspectionDate = securityInspectionDate;
+    }
+
+    public String getFireName() {
+        return fireName;
+    }
+
+    public void setFireName(String fireName) {
+        this.fireName = fireName == null ? null : fireName.trim();
+    }
+
+    public String getSecurityElectro() {
+        return securityElectro;
+    }
+
+    public void setSecurityElectro(String securityElectro) {
+        this.securityElectro = securityElectro == null ? null : securityElectro.trim();
+    }
+
+    public String getFireproofing() {
+        return fireproofing;
+    }
+
+    public void setFireproofing(String fireproofing) {
+        this.fireproofing = fireproofing == null ? null : fireproofing.trim();
+    }
+
+    public String getDoubtfulPerson() {
+        return doubtfulPerson;
+    }
+
+    public void setDoubtfulPerson(String doubtfulPerson) {
+        this.doubtfulPerson = doubtfulPerson == null ? null : doubtfulPerson.trim();
+    }
+
+    public String getViolationsCar() {
+        return violationsCar;
+    }
+
+    public void setViolationsCar(String violationsCar) {
+        this.violationsCar = violationsCar == null ? null : violationsCar.trim();
+    }
+
+    public String getBuilders() {
+        return builders;
+    }
+
+    public void setBuilders(String builders) {
+        this.builders = builders == null ? null : builders.trim();
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getRealname() {
+        return realname;
+    }
+
+    public void setRealname(String realname) {
+        this.realname = realname == null ? null : realname.trim();
+    }
+
+    public Date getOptTime() {
+        return optTime;
+    }
+
+    public void setOptTime(Date optTime) {
+        this.optTime = optTime;
+    }
+}

+package com.tianbo.warehouse.service.satff.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.dao.Group_companyMapper;
+import com.tianbo.warehouse.dao.StaffSecurityInspectionMapper;
+import com.tianbo.warehouse.model.Company;
+import com.tianbo.warehouse.model.Group_company;
+import com.tianbo.warehouse.model.StaffSecurityInspection;
+import com.tianbo.warehouse.service.CompanyService;
+import com.tianbo.warehouse.service.satff.StaffSecurityInspectionService;
+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 StaffSecurityInspectionServiceImp implements StaffSecurityInspectionService {
+
+    @Autowired
+    StaffSecurityInspectionMapper staffSecurityInspectionMapper;
+
+    @Override
+    public PageInfo<StaffSecurityInspection> findAll(int pageNum, int pageSize) {
+        Page<StaffSecurityInspection> page =  PageHelper.startPage(pageNum,pageSize);
+        List<StaffSecurityInspection> list = staffSecurityInspectionMapper.findAll();
+
+        PageInfo<StaffSecurityInspection> result = new PageInfo<>(list);
+        return result;
+    }
+
+    @Override
+    public int insertSelective(StaffSecurityInspection staffSecurityInspection) {
+        staffSecurityInspection.setSecurityInspectionId(UUID.randomUUID().toString());
+        staffSecurityInspection.setOptTime(new Date());
+        return staffSecurityInspectionMapper.insertSelective(staffSecurityInspection);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(StaffSecurityInspection staffSecurityInspection) {
+        staffSecurityInspection.setOptTime(new Date());
+        return staffSecurityInspectionMapper.updateByPrimaryKeySelective(staffSecurityInspection);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(String securityInspectionId) {
+        if (securityInspectionId.contains(",")){
+            try {
+                String a  = "";
+                String[] split = securityInspectionId.split(",");
+                for (int i=0; i<split.length; i++){
+                    staffSecurityInspectionMapper.deleteByPrimaryKey(split[i]);
+                }
+                return 1;
+            }catch (Exception e){
+                e.printStackTrace();
+                return 0;
+            }
+        }else {
+            return staffSecurityInspectionMapper.deleteByPrimaryKey(securityInspectionId);
+        }
+    }
+}

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

@@ -22,7 +22,7 @@
     select
     select
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
     from company
     from company
-    <if test="companyName != ''">
+    <if test="companyName != '' companyName != null">
       where company_name = #{companyName,jdbcType=VARCHAR}
       where company_name = #{companyName,jdbcType=VARCHAR}
     </if>
     </if>
     ORDER BY company_id
     ORDER BY company_id

@@ -21,7 +21,7 @@
     select
     select
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
     from department
     from department
-    <if test="departmentName != ''" >
+    <if test="departmentName != '' and departmentName != null" >
       where department_name = #{departmentName, jdbcType=VARCHAR}
       where department_name = #{departmentName, jdbcType=VARCHAR}
     </if>
     </if>
     ORDER BY department_id
     ORDER BY department_id

@@ -29,7 +29,7 @@
     select
     select
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
     from permission
     from permission
-    <if test="name != ''" >
+    <if test="name != '' and name !=null" >
       where name = #{name, jdbcType=VARCHAR}
       where name = #{name, jdbcType=VARCHAR}
     </if>
     </if>
     ORDER BY permission_order
     ORDER BY permission_order

+<?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.StaffSecurityInspectionMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.StaffSecurityInspection" >
+    <id column="security_inspection_id" property="securityInspectionId" jdbcType="VARCHAR" />
+    <result column="security_inspection_name" property="securityInspectionName" jdbcType="VARCHAR" />
+    <result column="security_inspection_date" property="securityInspectionDate" jdbcType="TIMESTAMP" />
+    <result column="fire_name" property="fireName" jdbcType="VARCHAR" />
+    <result column="security_electro" property="securityElectro" jdbcType="VARCHAR" />
+    <result column="fireproofing" property="fireproofing" jdbcType="VARCHAR" />
+    <result column="doubtful_person" property="doubtfulPerson" jdbcType="VARCHAR" />
+    <result column="violations_car" property="violationsCar" jdbcType="VARCHAR" />
+    <result column="builders" property="builders" jdbcType="VARCHAR" />
+    <result column="user_id" property="userId" jdbcType="INTEGER" />
+    <result column="realname" property="realname" jdbcType="VARCHAR" />
+    <result column="opt_time" property="optTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    security_inspection_id, security_inspection_name, security_inspection_date, fire_name, 
+    security_electro, fireproofing, doubtful_person, violations_car, builders, user_id, 
+    realname, opt_time
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from staff_security_inspection
+    where security_inspection_id = #{securityInspectionId,jdbcType=VARCHAR}
+  </select>
+
+  <select id="findAll" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from staff_security_inspection
+    ORDER BY opt_time
+  </select>
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from staff_security_inspection
+    where security_inspection_id = #{securityInspectionId,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.StaffSecurityInspection" >
+    insert into staff_security_inspection (security_inspection_id, security_inspection_name, 
+      security_inspection_date, fire_name, security_electro, 
+      fireproofing, doubtful_person, violations_car, 
+      builders, user_id, realname, 
+      opt_time)
+    values (#{securityInspectionId,jdbcType=VARCHAR}, #{securityInspectionName,jdbcType=VARCHAR}, 
+      #{securityInspectionDate,jdbcType=TIMESTAMP}, #{fireName,jdbcType=VARCHAR}, #{securityElectro,jdbcType=VARCHAR}, 
+      #{fireproofing,jdbcType=VARCHAR}, #{doubtfulPerson,jdbcType=VARCHAR}, #{violationsCar,jdbcType=VARCHAR}, 
+      #{builders,jdbcType=VARCHAR}, #{userId,jdbcType=INTEGER}, #{realname,jdbcType=VARCHAR}, 
+      #{optTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.StaffSecurityInspection" >
+    insert into staff_security_inspection
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="securityInspectionId != null" >
+        security_inspection_id,
+      </if>
+      <if test="securityInspectionName != null" >
+        security_inspection_name,
+      </if>
+      <if test="securityInspectionDate != null" >
+        security_inspection_date,
+      </if>
+      <if test="fireName != null" >
+        fire_name,
+      </if>
+      <if test="securityElectro != null" >
+        security_electro,
+      </if>
+      <if test="fireproofing != null" >
+        fireproofing,
+      </if>
+      <if test="doubtfulPerson != null" >
+        doubtful_person,
+      </if>
+      <if test="violationsCar != null" >
+        violations_car,
+      </if>
+      <if test="builders != null" >
+        builders,
+      </if>
+      <if test="userId != null" >
+        user_id,
+      </if>
+      <if test="realname != null" >
+        realname,
+      </if>
+      <if test="optTime != null" >
+        opt_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="securityInspectionId != null" >
+        #{securityInspectionId,jdbcType=VARCHAR},
+      </if>
+      <if test="securityInspectionName != null" >
+        #{securityInspectionName,jdbcType=VARCHAR},
+      </if>
+      <if test="securityInspectionDate != null" >
+        #{securityInspectionDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="fireName != null" >
+        #{fireName,jdbcType=VARCHAR},
+      </if>
+      <if test="securityElectro != null" >
+        #{securityElectro,jdbcType=VARCHAR},
+      </if>
+      <if test="fireproofing != null" >
+        #{fireproofing,jdbcType=VARCHAR},
+      </if>
+      <if test="doubtfulPerson != null" >
+        #{doubtfulPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="violationsCar != null" >
+        #{violationsCar,jdbcType=VARCHAR},
+      </if>
+      <if test="builders != null" >
+        #{builders,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null" >
+        #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="realname != null" >
+        #{realname,jdbcType=VARCHAR},
+      </if>
+      <if test="optTime != null" >
+        #{optTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.StaffSecurityInspection" >
+    update staff_security_inspection
+    <set >
+      <if test="securityInspectionName != null" >
+        security_inspection_name = #{securityInspectionName,jdbcType=VARCHAR},
+      </if>
+      <if test="securityInspectionDate != null" >
+        security_inspection_date = #{securityInspectionDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="fireName != null" >
+        fire_name = #{fireName,jdbcType=VARCHAR},
+      </if>
+      <if test="securityElectro != null" >
+        security_electro = #{securityElectro,jdbcType=VARCHAR},
+      </if>
+      <if test="fireproofing != null" >
+        fireproofing = #{fireproofing,jdbcType=VARCHAR},
+      </if>
+      <if test="doubtfulPerson != null" >
+        doubtful_person = #{doubtfulPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="violationsCar != null" >
+        violations_car = #{violationsCar,jdbcType=VARCHAR},
+      </if>
+      <if test="builders != null" >
+        builders = #{builders,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null" >
+        user_id = #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="realname != null" >
+        realname = #{realname,jdbcType=VARCHAR},
+      </if>
+      <if test="optTime != null" >
+        opt_time = #{optTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where security_inspection_id = #{securityInspectionId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.StaffSecurityInspection" >
+    update staff_security_inspection
+    set security_inspection_name = #{securityInspectionName,jdbcType=VARCHAR},
+      security_inspection_date = #{securityInspectionDate,jdbcType=TIMESTAMP},
+      fire_name = #{fireName,jdbcType=VARCHAR},
+      security_electro = #{securityElectro,jdbcType=VARCHAR},
+      fireproofing = #{fireproofing,jdbcType=VARCHAR},
+      doubtful_person = #{doubtfulPerson,jdbcType=VARCHAR},
+      violations_car = #{violationsCar,jdbcType=VARCHAR},
+      builders = #{builders,jdbcType=VARCHAR},
+      user_id = #{userId,jdbcType=INTEGER},
+      realname = #{realname,jdbcType=VARCHAR},
+      opt_time = #{optTime,jdbcType=TIMESTAMP}
+    where security_inspection_id = #{securityInspectionId,jdbcType=VARCHAR}
+  </update>
+</mapper>