人员管理

src/main/java/com/sky/ioc/controller/carbon/VehicleController.java

@@ -3,15 +3,15 @@ package com.sky.ioc.controller.carbon;
 import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.carbon.CarCarbonService;
 import com.sky.ioc.service.carbon.CarbonService;
+import com.sky.ioc.service.parking.IllegalParkingService;
+import com.sky.ioc.service.parking.ParkService;
+import com.sky.ioc.service.parking.ParkingService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * TODO
@@ -60,5 +60,13 @@ public class VehicleController {
     }
 
 
+    @Autowired
+    IllegalParkingService illegalParkingService;
+    @ApiOperation("车辆排放排名")
+    @GetMapping("/getData")
+    public ReturnMsg getData(){
+        return illegalParkingService.getIllegalParkingData();
+    }
+
 
 }

src/main/java/com/sky/ioc/controller/person/PersonController.java

@@ -0,0 +1,66 @@
+package com.sky.ioc.controller.person;
+
+import com.sky.ioc.entity.Index;
+import com.sky.ioc.entity.domain.person.Person;
+import com.sky.ioc.service.person.PersonService;
+import com.sky.ioc.tool.ReturnMsg;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = "人员管理")
+@Slf4j
+@RestController
+@RequestMapping("/person")
+public class PersonController {
+
+    @Autowired
+    PersonService personService;
+
+    @ApiOperation("人员列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "name", value = "姓名", dataType = "String"),
+            @ApiImplicitParam(name = "companyName", value = "公司", dataType = "String"),
+            @ApiImplicitParam(name = "deptName", value = "部门", dataType = "String"),
+            @ApiImplicitParam(name = "page", value = "页码",defaultValue="1", dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页大小", defaultValue="10",dataType = "Integer")
+    })
+    @GetMapping(value = "/getPersonList")
+    public ReturnMsg getPersonList(@RequestParam(name = "name", required = false) String name,
+                                @RequestParam(name = "companyName", required = false) String companyName,
+                                @RequestParam(name = "deptName", required = false) String deptName,
+                                @RequestParam(name = "page", required = false,defaultValue = "1") Integer page,
+                                @RequestParam(name = "pageSize", required = false,defaultValue = "10") Integer pageSize) {
+        return  personService.pageList(name,companyName,deptName,page,pageSize);
+    }
+
+    @ApiOperation("新建人员")
+    @PostMapping(value = "/addPerson")
+    public ReturnMsg addIndex(@RequestBody Person person) {
+        return  personService.addPerson(person);
+    }
+
+    @ApiOperation("编辑人员")
+    @PostMapping(value = "/editPerson")
+    public ReturnMsg editIndex(@RequestBody Person person) {
+        return  personService.editPerson(person);
+    }
+
+    @ApiOperation("删除人员")
+    @PostMapping(value = "/delPerson")
+    public ReturnMsg delIndex(@RequestParam(name = "id", required = true) Integer id) {
+        return  personService.delPersonById(id);
+    }
+
+    @ApiOperation("批量删除人员")
+    @PostMapping(value = "/batchDelByIds")
+    public ReturnMsg batchDelByIds(@RequestBody List<Integer> ids) {
+        return personService.delBatchById(ids);
+    }
+}

src/main/java/com/sky/ioc/controller/security/PersonController.java → src/main/java/com/sky/ioc/controller/security/SecurityPersonController.java

@@ -34,7 +34,7 @@ import org.springframework.web.bind.annotation.*;
 @Slf4j
 @RestController
 @RequestMapping("/security_person")
-public class PersonController {
+public class SecurityPersonController {
 
 
     @Autowired

src/main/java/com/sky/ioc/entity/domain/person/Person.java

@@ -0,0 +1,60 @@
+package com.sky.ioc.entity.domain.person;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+@Data
+public class Person {
+
+    @TableId(type = IdType.AUTO)
+    private  Integer id;
+
+    /**姓名*/
+    private String name;
+
+    /**单位ID*/
+    private String companyId;
+    /**单位名称*/
+    private String companyName;
+    /**
+     * 部门ID
+     * */
+    private Integer deptId;
+
+    /**部门名称*/
+    private String deptName;
+
+    /**手机号*/
+    private String phone;
+
+    /**
+     * 人员类型
+     * 0 正式员工
+     * 1 外协员工
+     * 2 驻场物业
+     * 3 施工人员
+     * 4 厂商
+     * 5 其他
+     * */
+    private Integer type;
+    /**人员状态
+     * 0 正常
+     * 1 已离职
+     * 2 暂时冻结
+     * */
+    private Integer status;
+
+    /***/
+    private String createTime;
+
+    /***/
+    private String updateTime;
+
+    /**
+     * 是否删除
+     * 0 否
+     * 1 是
+     * */
+    private Integer isDel;
+}

src/main/java/com/sky/ioc/mapper/ParkingMapper.java

@@ -14,7 +14,7 @@ public interface ParkingMapper extends BaseMapper<Parking> {
 
     @Select("<script>" +
             "SELECT count(1) FROM parking where 1=1 " +
-            "<if test='iocParam!=null and iocParam.companyId != null '>" +
+            "<if test='iocParam!=null and iocParam.companyId != null and iocParam.companyId != 0 '>" +
             " and company_id=#{iocParam.companyId} " +
             "</if>"+
             "</script>")
@@ -22,7 +22,7 @@ public interface ParkingMapper extends BaseMapper<Parking> {
 
     @Select("<script>" +
             "SELECT * FROM parking where 1=1 " +
-            "<if test='iocParam!=null and iocParam.companyId != null '>" +
+            "<if test='iocParam!=null and iocParam.companyId != null and iocParam.companyId != 0'>" +
             " and company_id=#{iocParam.companyId} " +
             "</if>"+
             " order by parking_numbers limit 100 OFFSET 0 </script>")

src/main/java/com/sky/ioc/mapper/person/PersonMapper.java

@@ -0,0 +1,43 @@
+package com.sky.ioc.mapper.person;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sky.ioc.entity.domain.person.Person;
+import com.sky.ioc.entity.params.scene.DoorAccessParam;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface PersonMapper extends BaseMapper<Person> {
+
+    @Update("<script>" +
+            " update person set is_del = 1,update_time = now() " +
+            " where id in (<foreach collection='ids' item='id' index='no' separator=','>#{id}</foreach>) "
+
+            + "</script>")
+    Integer batchDelByIds(@Param("ids") List<Integer> ids);
+
+
+    @Select("<script>" +
+            "SELECT * " +
+            "from  person " +
+            "where is_del=0 " +
+            "<if test='name!=null and name!=\"\" and name!=null'>" +
+            " and name like #{name} " +
+            "</if>" +
+            "<if test='companyName!=null and companyName!=\"\" and companyName!=null'>" +
+            " and company_name like #{companyName} " +
+            "</if>" +
+            "<if test='deptName!=null and deptName!=\"\" and deptName!=null'>" +
+            " and dept_name like #{deptName} " +
+            "</if>" +
+            "ORDER BY id " +
+            "</script>")
+    List<Person> pageList(@Param("name") String name,
+                          @Param("companyName") String companyName,
+                          @Param("deptName") String deptName);
+}

src/main/java/com/sky/ioc/service/parking/impl/ParkServiceImpl.java

@@ -35,7 +35,7 @@ public class ParkServiceImpl implements ParkService {
 
     @Override
     public ReturnMsg getParkData() {
-        String url = restTemplateConfig.addBaseUrl(PARK_URL+"?pageNum=1&pageSize=1000");
+        String url = restTemplateConfig.addBaseUrl(PARK_URL+"?pageNum=1&pageSize=100000");
 
         RestTemplate restTemplate = restTemplateConfig.build();
         // 发送GET请求
@@ -64,6 +64,7 @@ public class ParkServiceImpl implements ParkService {
                         park.setHours(hours);
                     }
                     park.setType(Integer.parseInt(String.valueOf(json.get("ifIllegal"))));
+                    park.setCompanyId("0");
                     parkMapper.insert(park);
                 }
             }

src/main/java/com/sky/ioc/service/person/PersonService.java

@@ -0,0 +1,20 @@
+package com.sky.ioc.service.person;
+
+import com.sky.ioc.entity.Index;
+import com.sky.ioc.entity.domain.person.Person;
+import com.sky.ioc.tool.ReturnMsg;
+
+import java.util.List;
+
+public interface PersonService {
+
+    ReturnMsg pageList(String name,String companyName,String deptName,Integer page,Integer pageSize);
+
+    ReturnMsg addPerson(Person person);
+
+    ReturnMsg editPerson(Person person);
+
+    ReturnMsg delPersonById(Integer id);
+
+    ReturnMsg delBatchById(List<Integer> ids);
+}

src/main/java/com/sky/ioc/service/person/impl/PersonServiceImpl.java

@@ -0,0 +1,81 @@
+package com.sky.ioc.service.person.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.sky.ioc.entity.Index;
+import com.sky.ioc.entity.domain.person.Person;
+import com.sky.ioc.mapper.person.PersonMapper;
+import com.sky.ioc.service.person.PersonService;
+import com.sky.ioc.tool.ReturnMsg;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class PersonServiceImpl implements PersonService {
+
+    @Autowired
+    PersonMapper personMapper;
+
+
+    @Override
+    public ReturnMsg pageList(String name,String companyName,String deptName,Integer page,Integer pageSize) {
+        PageHelper.startPage(page,pageSize);
+        if(StringUtils.isNotBlank(name)){
+            name ="%"+name+"%";
+        }
+        if(StringUtils.isNotBlank(companyName)){
+            companyName ="%"+companyName+"%";
+        }
+        if(StringUtils.isNotBlank(deptName)){
+            deptName ="%"+deptName+"%";
+        }
+        List<Person> lists = personMapper.pageList(name,companyName,deptName);
+        return ReturnMsg.ok(new PageInfo<>(lists));
+    }
+
+    @Override
+    public ReturnMsg addPerson(Person person) {
+        person.setCreateTime(new Date()+"");
+        personMapper.insert(person);
+        return ReturnMsg.ok();
+    }
+
+    @Override
+    public ReturnMsg editPerson(Person person) {
+        if(person.getId()==null){
+            return ReturnMsg.fail("参数错误");
+        }else{
+            person.setUpdateTime(new Date()+"");
+            personMapper.updateById(person);
+            return ReturnMsg.ok();
+        }
+    }
+
+    @Override
+    public ReturnMsg delPersonById(Integer id) {
+        if(id==null){
+            return ReturnMsg.fail("参数错误");
+        }else{
+            Person person = personMapper.selectById(id);
+            person.setIsDel(1);
+            person.setUpdateTime(new Date()+"");
+            personMapper.updateById(person);
+            return ReturnMsg.ok();
+        }
+    }
+
+    @Override
+    public ReturnMsg delBatchById(List<Integer> ids) {
+        if(ids.size()==0||ids==null){
+            return ReturnMsg.fail("参数错误");
+        }else{
+            personMapper.batchDelByIds(ids);
+            return ReturnMsg.ok();
+        }
+    }
+}