Merge remote-tracking branch 'origin/master' into master

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/dao/StationUserMapper.java

@@ -0,0 +1,45 @@
+package com.github.zuihou.business.productionResourceCenter.dao;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.github.zuihou.base.mapper.SuperMapper;
+import com.github.zuihou.business.productionResourceCenter.entity.StationUser;
+import com.github.zuihou.business.productionResourceCenter.entity.ZZone;
+import com.github.zuihou.common.constant.BizConstant;
+import com.github.zuihou.database.mybatis.auth.DataScope;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.tenant.entity.Productionresource;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ * Mapper 接口
+ * 区域管理
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-11-24
+ */
+@Repository
+public interface StationUserMapper extends SuperMapper<StationUser> {
+
+    @Select("SELECT f.*,group_concat(f.id) as ids,group_concat(f.user_id) as userIds ,group_concat(u.name) as userNames FROM imcs_station_user_conf f join c_auth_user u ON f.user_id = u.id group by f.station_id ${ew.customSqlSegment}")
+    List<StationUser> getStationUser(@Param(Constants.WRAPPER) Wrapper<StationUser> wrapper);
+
+    @Select("SELECT * FROM imcs_station_user_conf ${ew.customSqlSegment}")
+    List<StationUser> getStationByUser(@Param(Constants.WRAPPER) Wrapper<StationUser> wrapper);
+
+    @Select("SELECT v.id as stationId,v.name as stationName FROM view_productionresource v where v.module_name='上下料站' and v.status=1 ${ew.customSqlSegment}")
+    List<StationUser> getAllStation(@Param(Constants.WRAPPER) Wrapper<StationUser> wrapper);
+
+    @Select("SELECT u.id as userId,u.name as userName FROM c_auth_user_role c join c_auth_user u on c.user_id=u.id join c_auth_role r on c.role_id=r.id where r.name like '%上料%' or r.name like '%下料%' ${ew.customSqlSegment}")
+    List<StationUser> getAllUser(@Param(Constants.WRAPPER) Wrapper<StationUser> wrapper);
+
+    @Select("truncate table "+ BizConstant.BASE_DATABASE + "_0000.imcs_station_user_conf")
+    StationUser truncate();
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/StationUserService.java

@@ -0,0 +1,55 @@
+package com.github.zuihou.business.productionResourceCenter.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.github.zuihou.base.service.SuperService;
+import com.github.zuihou.business.productionResourceCenter.dto.StationUserSaveDTO;
+import com.github.zuihou.business.productionResourceCenter.dto.StationUserUpdateDTO;
+import com.github.zuihou.business.productionResourceCenter.dto.ZZoneSaveDTO;
+import com.github.zuihou.business.productionResourceCenter.dto.ZZoneUpdateDTO;
+import com.github.zuihou.business.productionResourceCenter.entity.StationUser;
+import com.github.zuihou.business.productionResourceCenter.entity.ZZone;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.tenant.entity.Productionresource;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 业务接口
+ * 区域管理
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-11-24
+ */
+public interface StationUserService extends SuperService<StationUser> {
+
+
+    List<StationUser> getStationUser(LbqWrapper<StationUser> wrapper);
+
+    List<StationUser> getStationByUser(LbqWrapper<StationUser> wrapper);
+
+    List<StationUser> getAllStation(LbqWrapper<StationUser> wrapper);
+
+    List<StationUser> getAllUser(LbqWrapper<StationUser> wrapper);
+
+    /**
+     * 保存
+     *
+     * @param data
+     * @return
+     */
+    StationUser save(StationUserSaveDTO data);
+
+    /**
+     * 修改
+     */
+    StationUser update(StationUserUpdateDTO data);
+
+    StationUser truncate();
+
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/StationUserServiceImpl.java

@@ -0,0 +1,93 @@
+package com.github.zuihou.business.productionResourceCenter.service.impl;
+
+import com.github.zuihou.authority.service.common.DictionaryItemService;
+import com.github.zuihou.base.service.SuperServiceImpl;
+import com.github.zuihou.business.operationManagementCenter.dao.TTaskMapper;
+import com.github.zuihou.business.productionResourceCenter.dao.StationUserMapper;
+import com.github.zuihou.business.productionResourceCenter.dto.StationUserSaveDTO;
+import com.github.zuihou.business.productionResourceCenter.dto.StationUserUpdateDTO;
+import com.github.zuihou.business.productionResourceCenter.entity.StationUser;
+import com.github.zuihou.business.productionResourceCenter.service.StationUserService;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.tenant.dao.ProductionresourceviewMapper;
+import com.github.zuihou.tenant.entity.Productionresource;
+import com.github.zuihou.utils.BeanPlusUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 业务实现类
+ * 区域管理
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-11-24
+ */
+@Slf4j
+@Service
+public class StationUserServiceImpl extends SuperServiceImpl<StationUserMapper, StationUser> implements StationUserService {
+
+    @Autowired
+    private StationUserService stationUserService;
+
+    @Autowired
+    private DictionaryItemService dictionaryItemService;
+
+    @Autowired
+    private StationUserMapper stationUserMapper;
+
+    @Autowired
+    private RedisTemplate<String,Object> redisTemplate;
+
+    @Autowired
+    private ProductionresourceviewMapper productionresourceviewMapper;
+
+    @Override
+    public List<StationUser> getStationUser(LbqWrapper<StationUser> wrapper) {
+        return stationUserMapper.getStationUser(wrapper);
+    }
+
+    @Override
+    public List<StationUser> getStationByUser(LbqWrapper<StationUser> wrapper) {
+        return stationUserMapper.getStationByUser(wrapper);
+    }
+
+    @Override
+    public List<StationUser> getAllStation(LbqWrapper<StationUser> wrapper) {
+        return stationUserMapper.getAllStation(wrapper);
+    }
+
+    @Override
+    public List<StationUser> getAllUser(LbqWrapper<StationUser> wrapper) {
+        return stationUserMapper.getAllUser(wrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public StationUser save(StationUserSaveDTO data) {
+        StationUser stationUser = BeanPlusUtil.toBean(data, StationUser.class);
+        save(stationUser);
+        return stationUser;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public StationUser update(StationUserUpdateDTO data) {
+        StationUser stationUser = BeanPlusUtil.toBean(data, StationUser.class);
+        updateById(stationUser);
+        return stationUser;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public StationUser truncate() {
+        return stationUserMapper.truncate();
+    }
+
+}

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionResourceCenter/StationUserController.java

@@ -0,0 +1,131 @@
+package com.github.zuihou.business.controller.productionResourceCenter;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.zuihou.authority.entity.common.DictionaryItem;
+import com.github.zuihou.base.R;
+import com.github.zuihou.base.controller.SuperController;
+import com.github.zuihou.business.productionResourceCenter.dto.StationUserPageDTO;
+import com.github.zuihou.business.productionResourceCenter.dto.StationUserSaveDTO;
+import com.github.zuihou.business.productionResourceCenter.dto.StationUserUpdateDTO;
+import com.github.zuihou.business.productionResourceCenter.entity.StationUser;
+import com.github.zuihou.business.productionResourceCenter.service.StationUserService;
+import com.github.zuihou.common.util.StringUtil;
+import com.github.zuihou.database.mybatis.conditions.Wraps;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.log.annotation.SysLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * <p>
+ * 前端控制器
+ * 上下料用户管理
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-11-24
+ */
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/stationUser")
+@Api(value = "stationUser", tags = "上下料站用户管理")
+@SysLog(enabled = true)
+public class StationUserController extends SuperController<StationUserService, Long, StationUser, StationUserPageDTO, StationUserSaveDTO, StationUserUpdateDTO> {
+
+    @ApiOperation(value = "查询上下料用户管理", notes = "查询上下料用户管理")
+    @GetMapping("/all")
+    public R<List<StationUser>> list() {
+        return success(baseService.list());
+    }
+
+    /*
+    @Override
+    public R<StationUser> handlerSave(StationUserSaveDTO model) {
+        StationUser stationUser = baseService.save(model);
+        return success(stationUser);
+    } */
+
+    @ApiOperation(value = "修改上下料用户管理", notes = "修改上下料用户管理")
+    @PostMapping("/update")
+    public R<StationUser> update(StationUserUpdateDTO model) {
+        StationUser stationUser = baseService.update(model);
+        return success(stationUser);
+    }
+
+    @ApiOperation(value = "新增上下料用户", notes = "新增上下料用户")
+    @PostMapping("/saveAll")
+    public R<Boolean> saveAll(@RequestParam(value = "stationIds[]") List<String> stationIds, @RequestParam(value = "userIds[]") List<String> userIds) {
+         List<StationUser> stationUserList = Lists.newArrayList();
+         for(int i=0; i<stationIds.size(); i++){
+            String[] idArr = userIds.get(i).split(",");
+            for(int j=0;j<idArr.length; j++){
+                StationUser stationUser = new StationUser();
+                stationUser.setStationId(Long.parseLong(stationIds.get(i)));
+                stationUser.setUserId(Long.parseLong(idArr[j]));
+                stationUserList.add(stationUser);
+            }
+        }
+        Boolean bool = baseService.saveOrUpdateBatch(stationUserList) ;
+        return success(bool);
+    }
+
+    @ApiOperation(value = "更新上下料用户", notes = "更新上下料用户")
+    @PostMapping("/updateAll")
+    public R<Boolean> updateAll(@RequestParam(value = "ids[]") List<String> ids,@RequestParam(value = "stationIds[]") List<String> stationIds, @RequestParam(value = "userIds[]") List<String> userIds) {
+        //baseService.removeByIds(ids.stream().filter(id->!id.equals("0")).collect(Collectors.toList()));
+        //清空数据表
+        baseService.truncate();
+        List<StationUser> stationUserList = Lists.newArrayList();
+        for(int i=0; i<ids.size(); i++){
+            StationUser stationUser = new StationUser();
+            stationUser.setUserId(Long.parseLong(userIds.get(i)));
+            stationUser.setStationId(Long.parseLong(stationIds.get(i)));
+            stationUserList.add(stationUser);
+        }
+        Boolean bool = baseService.saveOrUpdateBatch(stationUserList) ;
+        return success(bool);
+    }
+
+    @ApiOperation(value = "查询上下料站", notes = "查询上下料站")
+    @GetMapping("/allStation")
+    public R<List<StationUser>> getAllStations() {
+        return success(baseService.getAllStation(new LbqWrapper<>()));
+    }
+
+    @ApiOperation(value = "查询上下料用户", notes = "查询上下料用户")
+    @GetMapping("/allUser")
+    public R<List<StationUser>> getAllUser() {
+        return success(baseService.getAllUser(new LbqWrapper<>()));
+    }
+
+    @ApiOperation(value = "查询上下料用户", notes = "查询上下料用户")
+    @GetMapping("/stationUser")
+    public R<List<StationUser>> getStationUser(@RequestParam(value="userId",required = false) Long userId) {
+        LbqWrapper<StationUser> wrapper = Wraps.<StationUser>lbQ();
+        if(userId!= null){
+            wrapper.eq(StationUser::getUserId, userId);
+        }
+        return success(baseService.getStationUser(wrapper));
+    }
+
+    @ApiOperation(value = "查询上下料用户", notes = "查询上下料用户")
+    @GetMapping("/getStation")
+    public R<List<StationUser>> getStationByUser(@RequestParam(value="userId",required = false) String userId) {
+        LbqWrapper<StationUser> wrapper = Wraps.<StationUser>lbQ();
+        if(userId!= null){
+            wrapper.eq(StationUser::getUserId, userId);
+        }
+        return success(baseService.getStationByUser(wrapper));
+    }
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionResourceCenter/dto/StationUserPageDTO.java

@@ -0,0 +1,47 @@
+package com.github.zuihou.business.productionResourceCenter.dto;
+
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@ApiModel(value = "StationUserPageDTO", description = "上下料站用户管理")
+public class StationUserPageDTO {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    @ApiModelProperty(value = "管理人员ID")
+    private Long userId;
+
+    /**
+     * 上下料站ID
+     */
+    @ApiModelProperty(value = "上下料站ID")
+    private Long stationId;
+
+    @ApiModelProperty(value = "用户名称")
+    private String userName;
+
+    @ApiModelProperty(value = "上下料站名称")
+    private String stationName;
+
+    @ApiModelProperty(value = "上下料站用户")
+    private List stationUserList;
+
+    @ApiModelProperty(value = "上下料站用户")
+    private List stationList;
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionResourceCenter/dto/StationUserSaveDTO.java

@@ -0,0 +1,33 @@
+package com.github.zuihou.business.productionResourceCenter.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@ApiModel(value = "StationUserSaveDTO", description = "上下料站用户管理")
+public class StationUserSaveDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 用户ID
+     */
+    @ApiModelProperty(value = "管理人员ID")
+    private Long userId;
+
+    /**
+     * 上下料站ID
+     */
+    @ApiModelProperty(value = "上下料站ID")
+    private Long stationId;
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionResourceCenter/dto/StationUserUpdateDTO.java

@@ -0,0 +1,42 @@
+package com.github.zuihou.business.productionResourceCenter.dto;
+
+import com.github.zuihou.base.entity.SuperEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@ApiModel(value = "StationUserUpdateDTO", description = "上下料站用户管理")
+public class StationUserUpdateDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @NotNull(message = "id不能为空", groups = SuperEntity.Update.class)
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    @ApiModelProperty(value = "管理人员ID")
+    @NotNull(message = "管理人员ID不能为空")
+    private Long userId;
+
+    /**
+     * 上下料站ID
+     */
+    @ApiModelProperty(value = "上下料站ID")
+    @NotNull(message = "上下料站ID不能为空")
+    private Long stationId;
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionResourceCenter/entity/StationUser.java

@@ -0,0 +1,61 @@
+package com.github.zuihou.business.productionResourceCenter.entity;
+
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.zuihou.base.entity.Entity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("imcs_station_user_conf")
+@ApiModel(value = "StationUser", description = "上下料站操作用户")
+@AllArgsConstructor
+public class StationUser extends Entity<Long> {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    @ApiModelProperty(value = "管理人员ID")
+    @TableField("user_id")
+    @Excel(name = "管理人员ID")
+    private Long userId;
+
+    /**
+     * 上下料站ID
+     */
+    @ApiModelProperty(value = "上下料站ID")
+    @TableField("station_id")
+    @Excel(name = "上下料站ID")
+    private Long stationId;
+
+    @ApiModelProperty(value = "用户名称")
+    @TableField(exist=false)
+    private String userName;
+
+    @ApiModelProperty(value = "上下料站名称")
+    @TableField(exist=false)
+    private String stationName;
+
+    @ApiModelProperty(value = "多选用户名")
+    @TableField(exist=false)
+    private String userNames;
+
+    @ApiModelProperty(value = "多选用户ID")
+    @TableField(exist=false)
+    private String userIds;
+
+    @ApiModelProperty(value = "多选ID")
+    @TableField(exist=false)
+    private String ids;
+}

imcs-admin-boot/imcs-tenant-entity/src/main/java/com/github/zuihou/tenant/entity/Productionresource.java

@@ -2,38 +2,24 @@ package com.github.zuihou.tenant.entity;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import cn.afterturn.easypoi.excel.annotation.ExcelEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.github.zuihou.base.entity.Entity;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.github.zuihou.common.constant.DictionaryType;
 import com.github.zuihou.injection.annonation.InjectionField;
 import com.github.zuihou.model.RemoteData;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import lombok.*;
+import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.constraints.Range;
 
-import java.beans.Transient;
 import java.time.LocalDateTime;
 import java.util.List;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-import com.github.zuihou.common.constant.DictionaryType;
-
+import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
 import static com.github.zuihou.common.constant.InjectionFieldConstants.DICTIONARY_ITEM_CLASS;
 import static com.github.zuihou.common.constant.InjectionFieldConstants.DICTIONARY_ITEM_METHOD;
-import static com.github.zuihou.utils.DateUtils.DEFAULT_DATE_TIME_FORMAT;
-
-import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
 
 /**
  * <p>