Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/TriggerDto.java

+package com.junmp.jyzb.api.bean.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class TriggerDto  {
+    private String id;
+    private String triggerName;
+    private String actionClass;
+    private String delFlag;
+    private String contacts;
+    private String remark;
+    private Date createTime;
+    private Date updateTime;
+    private String createUser;
+    private String updateUser;
+
+}

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryTriggerReq.java

+package com.junmp.jyzb.api.bean.query;
+
+import com.junmp.v2.common.bean.request.BaseRequest;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+@Data
+public class QueryTriggerReq extends BaseRequest {
+    private String id;
+    private String triggerName;
+
+    private String delFlag;
+
+}

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateTriggerReq.java

+package com.junmp.jyzb.api.bean.req;
+
+import com.junmp.v2.common.bean.request.ValidationApi;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class UpdateTriggerReq {
+    @NotBlank(message = "触发器主键不能为空", groups = {ValidationApi.edit.class, ValidationApi.delete.class, ValidationApi.detail.class})
+    private String id;
+    private String triggerName;
+    private String actionClass;
+    private Integer delFlag;
+    private String remark;
+
+
+}

jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/TriggerExceptionEnum.java

+package com.junmp.jyzb.api.exception.enums;
+
+import com.junmp.jyzb.api.constant.JYZBConstant;
+import com.junmp.v2.common.constant.CommonConstant;
+import com.junmp.v2.common.exception.IExceptionEnum;
+import lombok.Getter;
+
+@Getter
+public enum TriggerExceptionEnum implements IExceptionEnum {
+    /**
+     *
+     */
+    TRIGGER_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 12, "触发器不存在"),
+    /**
+     *
+     */
+    TRIGGER_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE,"触发器已存在");
+
+
+
+    /**
+     * 错误编码
+     */
+    private final Integer code;
+
+    /**
+     * 提示用户信息
+     */
+    private final String message;
+
+    TriggerExceptionEnum(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

jyzb-biz/src/main/java/com/junmp/jyzb/controller/TriggerController.java

+package com.junmp.jyzb.controller;
+
+
+import com.junmp.jyzb.api.bean.query.QueryTriggerReq;
+import com.junmp.jyzb.api.bean.req.UpdateTriggerReq;
+import com.junmp.jyzb.entity.Trigger;
+import com.junmp.jyzb.service.TriggerService;
+import com.junmp.v2.common.bean.request.ValidationApi;
+import com.junmp.v2.common.bean.response.ApiRes;
+import com.junmp.v2.db.api.page.PageResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+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 javax.annotation.Resource;
+
+@RestController
+@Slf4j
+@RequestMapping("/Trigger")
+@Api(tags = "触发器模块")
+public class TriggerController {
+    @Resource
+    public TriggerService triggerService;
+
+    @PostMapping("/AddTrigger")
+    @ApiOperation("添加触发器")
+    public ApiRes<String> AddTrigger(@RequestBody @Validated(ValidationApi.add.class) UpdateTriggerReq req) {
+        return ApiRes.success(triggerService.addTrigger(req));
+    }
+    @PostMapping("/UpdateTrigger")
+    @ApiOperation("修改触发器")
+    public ApiRes<Boolean> UpdateTrigger(@RequestBody @Validated(ValidationApi.edit.class) UpdateTriggerReq req) {
+        return ApiRes.success(triggerService.updateTrigger(req));
+    }
+    @PostMapping("/DeleteTrigger")
+    @ApiOperation("删除触发器")
+    public ApiRes<Boolean> DeleteTrigger(@RequestBody @Validated(ValidationApi.delete.class) UpdateTriggerReq req) {
+        return ApiRes.success(triggerService.deleteTrigger(req));
+    }
+    @PostMapping("/ChangeTriggerState")
+    @ApiOperation("禁用启用触发器")
+    public ApiRes<Boolean> ChangeTriggerState(@RequestBody @Validated(ValidationApi.updateStatus.class) UpdateTriggerReq req) {
+        return ApiRes.success(triggerService.changeTriggerState(req));
+    }
+    @PostMapping("/GetTriggerList")
+    @ApiOperation("查询触发器列表")
+    public ApiRes<PageResult<Trigger>> GetTriggerList(@RequestBody @Validated(ValidationApi.updateStatus.class) QueryTriggerReq req) {
+        return ApiRes.success(triggerService.getTriggerList(req));
+    }
+}

jyzb-biz/src/main/java/com/junmp/jyzb/entity/Trigger.java

+package com.junmp.jyzb.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("sys_trigger")
+public class Trigger implements Serializable {
+    /**
+     * 供应商ID
+     */
+    @TableId(value = "id")
+    private String id;
+
+    /**
+     * 触发器名称
+     */
+    @TableField(value = "trigger_name")
+    private String triggerName;
+
+    /**
+     * 地址
+     */
+    @TableField(value = "action_class")
+    private String actionClass;
+
+    /**
+     * 删除标识
+     */
+    @TableField(value = "del_flag")
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE, value = "create_time")
+    private Date createTime;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE, value = "update_time")
+    private Date updateTime;
+
+
+
+    /**
+     * 更新人ID
+     */
+    @TableField(value = "update_user")
+    private String updateUser;
+
+}

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/TriggerMapper.java

+package com.junmp.jyzb.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.junmp.jyzb.entity.Trigger;
+import com.junmp.jyzb.entity.User;
+
+public interface TriggerMapper extends BaseMapper<Trigger> {
+}

jyzb-biz/src/main/java/com/junmp/jyzb/service/TriggerService.java

+package com.junmp.jyzb.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.api.bean.dto.TriggerDto;
+import com.junmp.jyzb.api.bean.dto.WarehouseAreaDto;
+import com.junmp.jyzb.api.bean.query.QueryTriggerReq;
+import com.junmp.jyzb.api.bean.query.WarehouseAreaReq;
+import com.junmp.jyzb.api.bean.req.UpdateTriggerReq;
+import com.junmp.jyzb.api.bean.req.UpdateWarehouseAreaReq;
+import com.junmp.jyzb.entity.ProductTag;
+import com.junmp.jyzb.entity.Trigger;
+import com.junmp.jyzb.entity.User;
+import com.junmp.v2.db.api.page.PageResult;
+
+import java.util.List;
+
+public interface TriggerService extends IService<Trigger> {
+    String addTrigger(UpdateTriggerReq req);
+
+    Boolean updateTrigger(UpdateTriggerReq msg);
+
+    Boolean deleteTrigger(UpdateTriggerReq msg);
+
+    boolean changeTriggerState(UpdateTriggerReq msg);
+
+    PageResult<Trigger> getTriggerList(QueryTriggerReq req);
+}

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/TriggerServiceImpl.java

+package com.junmp.jyzb.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.jyzb.api.bean.dto.TriggerDto;
+import com.junmp.jyzb.api.bean.query.ProductTagReq;
+import com.junmp.jyzb.api.bean.query.QueryTriggerReq;
+import com.junmp.jyzb.api.bean.req.UpdateSupplierReq;
+import com.junmp.jyzb.api.bean.req.UpdateTriggerReq;
+import com.junmp.jyzb.api.exception.enums.SupplierExceptionEnum;
+import com.junmp.jyzb.api.exception.enums.TriggerExceptionEnum;
+import com.junmp.jyzb.api.exception.enums.WarehouseAreaExceptionEnum;
+import com.junmp.jyzb.entity.ProductTag;
+import com.junmp.jyzb.entity.Supplier;
+import com.junmp.jyzb.entity.Trigger;
+import com.junmp.jyzb.entity.WarehouseArea;
+import com.junmp.jyzb.mapper.TriggerMapper;
+import com.junmp.jyzb.mapper.WarehouseAreaMapper;
+import com.junmp.jyzb.service.TriggerService;
+import com.junmp.jyzb.service.WarehouseAreaService;
+import com.junmp.v2.common.exception.base.ServiceException;
+import com.junmp.v2.common.util.BeanPlusUtil;
+import com.junmp.v2.db.api.factory.PageFactory;
+import com.junmp.v2.db.api.factory.PageResultFactory;
+import com.junmp.v2.db.api.page.PageResult;
+import org.springframework.stereotype.Service;
+
+import java.util.UUID;
+@Service
+public class TriggerServiceImpl extends ServiceImpl<TriggerMapper, Trigger> implements TriggerService {
+    @Override
+    public String addTrigger(UpdateTriggerReq req) {
+        Trigger trigger = new Trigger();
+        String ID= UUID.randomUUID().toString();
+        req.setId(ID);
+        BeanPlusUtil.copyProperties(req, trigger);
+        this.save(trigger);
+        return ID;
+    }
+
+    @Override
+    public Boolean updateTrigger(UpdateTriggerReq req) {
+        Trigger trigger = this.Query(req);
+        BeanPlusUtil.copyProperties(req, trigger);
+        return this.updateById(trigger);
+    }
+    private Trigger Query(UpdateTriggerReq req) {
+        Trigger app = this.getById(req.getId());
+        if (ObjectUtil.isNull(app)) {
+            throw new ServiceException(TriggerExceptionEnum.TRIGGER_NOT_EXIST);
+        }
+        return app;
+    }
+    @Override
+    public Boolean deleteTrigger(UpdateTriggerReq req) {
+
+        TriggerExist(req.getId());
+        Trigger trigger = new Trigger();
+        BeanPlusUtil.copyProperties(req,trigger);
+        return this.removeById(trigger.getId());
+    }
+    private Trigger TriggerExist(String id){
+        Trigger trigger = this.getById(id);
+        if (ObjectUtil.isNull(trigger)){
+            throw new ServiceException(TriggerExceptionEnum.TRIGGER_NOT_EXIST);
+        }
+        return trigger;
+    }
+    @Override
+    public boolean changeTriggerState(UpdateTriggerReq req) {
+        Trigger trigger = this.Query(req);
+        BeanPlusUtil.copyProperties(req, trigger);
+        return this.updateById(trigger);
+    }
+
+    public PageResult<Trigger> getTriggerList(QueryTriggerReq req)
+    {
+        LambdaQueryWrapper<Trigger> wrapper = createWrapper(req);
+        Page<Trigger> page = this.page(PageFactory.getDefaultPage(), wrapper);
+        return PageResultFactory.createPageResult(page);
+    }
+    private LambdaQueryWrapper<Trigger> createWrapper(QueryTriggerReq req) {
+        LambdaQueryWrapper<Trigger> wrapper = new LambdaQueryWrapper<>();
+        if (ObjectUtil.isEmpty(req)) {
+            return wrapper;
+        }
+        //根据业务编码查询
+        wrapper.like(ObjectUtil.isNotEmpty(req.getTriggerName()), Trigger::getTriggerName, req.getTriggerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getId()), Trigger::getId, req.getId());
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getDelFlag()), Trigger::getDelFlag, req.getDelFlag());
+
+
+        wrapper.orderByDesc(Trigger::getCreateTime);
+        wrapper.orderByDesc(Trigger::getUpdateTime);
+        return wrapper;
+    }
+
+}

jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/SettingService.java

-//package com.junmp.junmpProcess.service.Bussiness;
-//
-//import com.junmp.junmpProcess.dto.FlowEngineDTO;
-//import com.junmp.junmpProcess.entity.ProcessTemplates;
-//import com.junmp.junmpProcess.vo.TemplateGroupVo;
-//
-//import java.lang.reflect.InvocationTargetException;
-//import java.util.List;
-//
-///**
-// * @author : willian fu
-// * @date : 2020/9/21
-// */
-//public interface SettingService {
-//
-//    /**
-//     * 查询表单组
-//     *
-//     * @return 表单组数据
-//     */
-//    Object getFormGroups(String token, String name);
-//
-//    /**
-//     * 表单及分组排序
-//     *
-//     * @param groups 分组数据
-//     * @return 排序结果
-//     */
-//    Object formGroupsSort(List<TemplateGroupVo> groups);
-//
-//    /**
-//     * 查询表单模板数据
-//     *
-//     * @param templateId 模板id
-//     * @return 模板详情数据
-//     */
-//    Object getFormTemplateById(String templateId);
-//
-//    /**
-//     * 修改分组
-//     *
-//     * @param id   分组ID
-//     * @param name 分组名
-//     * @return 修改结果
-//     */
-//    Object updateFormGroupName(Integer id, String name);
-//
-//    /**
-//     * 新增表单分组
-//     *
-//     * @param name 分组名
-//     * @return 添加结果
-//     */
-//    Object createFormGroup(String name);
-//
-//    /**
-//     * 删除分组
-//     *
-//     * @param id 分组ID
-//     * @return 删除结果
-//     */
-//    Object deleteFormGroup(Integer id);
-//
-//    /**
-//     * 编辑表单
-//     *
-//     * @param templateId 摸板ID
-//     * @param type       类型 stop using delete
-//     * @return 操作结果
-//     */
-//    Object updateForm(String templateId, String type, Integer groupId);
-//
-//    /**
-//     * 编辑表单详情
-//     *
-//     * @param template 表单模板信息
-//     * @return 修改结果
-//     */
-//    Object updateFormDetail(ProcessTemplates template);
-//
-//
-//    /**
-//     * 保存表单
-//     *
-//     * @param
-//     * @throws InvocationTargetException
-//     * @throws IllegalAccessException
-//     */
-//    void jsonToBpmn(FlowEngineDTO flowEngineDTO) throws InvocationTargetException, IllegalAccessException;
-//}

jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/OrgUserServicelmpl.java

-package com.junmp.junmpProcess.service.Bussiness.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.junmp.v2.sys.api.UserServiceApi;
-import com.junmp.v2.sys.api.bean.user.OnlineUserDto;
-import com.junmp.v2.sys.api.bean.user.SysUserDto;
-import com.junmp.v2.sys.api.bean.user.UserLoginInfoDto;
-import com.junmp.v2.sys.api.bean.user.dto.RoleUserDto;
-import com.junmp.v2.sys.api.bean.user.req.OnlineUserReq;
-import com.junmp.v2.sys.api.bean.user.req.SysUserReq;
-import com.junmp.v2.sys.api.bean.user.vo.QueryUserInfoVo;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-public class OrgUserServicelmpl  implements UserServiceApi {
-
-
-    @Override
-    public UserLoginInfoDto getUserLoginInfo(String account) {
-        return null;
-    }
-
-    @Override
-    public void updateUserLoginInfo(Long userId, Date date, String ip) {
-
-    }
-
-    @Override
-    public Boolean userExist(Long userId) {
-        return null;
-    }
-
-    @Override
-    public List<Long> getUserRoleIdList(Long userId) {
-        return null;
-    }
-
-    @Override
-    public void deleteUserDataScopeListByOrgIdList(Set<Long> organizationIds) {
-
-    }
-
-    @Override
-    public void deleteUserRoleListByRoleId(Long roleId) {
-
-    }
-
-    @Override
-    public List<Long> getUserBindDataScope(Long userId) {
-        return null;
-    }
-
-    @Override
-    public List<OnlineUserDto> onlineUserList(OnlineUserReq req) {
-        return null;
-    }
-
-    @Override
-    public SysUserDto getUserInfoByUserId(Long userId) {
-        return null;
-    }
-
-    @Override
-    public List<Long> queryAllUserIdList(SysUserReq req) {
-        return null;
-    }
-
-    @Override
-    public List<String> queryAppByUserId(Long userId) {
-
-        return null;
-    }
-
-    @Override
-    public RoleUserDto queryUserByRoleId(Long roleId) {
-        return null;
-    }
-
-    @Override
-    public List<QueryUserInfoVo> queryUserByRoleAndOrg(Long roleId, Long orgId) {
-        return null;
-    }
-}