BUG修复

pull/188/MERGE^2
dxfeng 3 years ago
parent 08a9ab7b0d
commit 6576335c6c

@ -1,14 +0,0 @@
package com.api.organization.web;
import javax.ws.rs.Path;
/**
* @Author weaver_cl
* @Description:
* @Date 2022/4/26
* @Version V1.0
**/
@Path("/bs/hrmorganization/demo")
public class DemoController extends com.engine.organization.web.DemoController {
}

@ -1,55 +0,0 @@
package com.engine.organization.entity.po;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @Author weaver_cl
* @description:
* @Date 2022/4/26
* @Version V1.0
**/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class Demo {
//主建,非自增 0表示集团 正数是现有分部信息ID
private Integer fid;
//1-集团或者虚拟组织名称 2-分部级虚拟组织分部
private Integer flevel;
//维度: 0-行政维度 负数-虚拟组织架构id
private Integer fwd;
//编号
private String fnumber;
//名称
private String fname;
//负责人id
private Integer fleader;
//编制人数
private Integer fplan;
//在岗人数
private Integer fonjob;
//是否虚拟组织0-实体组织1-虚拟组织
private Integer fisvitual;
//生效时间
private Date ftimebegin;
//失效时间
private Date ftimeend;
}

@ -1,27 +0,0 @@
package com.engine.organization.mapper;
import com.engine.organization.entity.po.Demo;
import java.util.List;
/**
* @Author weaver_cl
* @description:
* @Date 2022/3/9
* @Version V1.0
**/
public interface DemoMapper {
/**
*
* @return
*/
List<Demo> listAll();
}

@ -1,43 +0,0 @@
<?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.engine.organization.mapper.DemoMapper">
<resultMap id="BaseResultMap" type="com.engine.organization.entity.po.Demo">
<result column="fid" property="fid"/>
<result column="flevel" property="flevel"/>
<result column="fwd" property="fwd"/>
<result column="fnumber" property="fnumber"/>
<result column="fname" property="fname"/>
<result column="fleader" property="fleader"/>
<result column="fplan" property="fplan"/>
<result column="fonjob" property="fonjob"/>
<result column="fisvitual" property="fisvitual"/>
<result column="ftimebegin" property="ftimebegin"/>
<result column="ftimeend" property="ftimeend"/>
</resultMap>
<!-- 表字段 -->
<sql id="baseColumns">
t.fid
, t.flevel
, t.fwd
, t.fnumber
, t.fname
, t.fleader
, t.fplan
, t.fonjob
, t.fisvitual
, t.ftimebegin
, t.ftimeend
</sql>
<select id="listAll" resultMap="BaseResultMap">
SELECT
<include refid="baseColumns"/>
FROM hr_company t
</select>
</mapper>

@ -1,22 +0,0 @@
package com.engine.organization.service;
import com.engine.organization.entity.po.Demo;
import java.util.List;
/**
* @Author weaver_cl
* @description:
* @Date 2022/4/27
* @Version V1.0
**/
public interface DemoService {
/**
*
* @param name
* @return
*/
List<Demo> list(String name);
}

@ -1,15 +0,0 @@
package com.engine.organization.service;
import com.engine.organization.entity.po.Demo;
/**
* @Author weaver_cl
* @description:
* @Date 2022/4/28
* @Version V1.0
**/
public interface TestService {
Demo list(String name);
}

@ -1,57 +0,0 @@
package com.engine.organization.service.impl;
import com.engine.core.impl.Service;
import com.engine.organization.entity.po.Demo;
import com.engine.organization.mapper.DemoMapper;
import com.engine.organization.service.DemoService;
import com.engine.organization.util.HrmI18nUtil;
import com.engine.organization.util.OrganizationAssert;
import com.engine.organization.util.db.MapperProxyFactory;
import java.util.List;
/**
* @Author weaver_cl
* @description:
* @Date 2022/4/27
* @Version V1.0
**/
//@WeaIocService
//@WeaIocReplaceComponent("demoService") //如不标注名称,则按类的全路径注入
public class DemoServiceImpl extends Service implements DemoService {
@Override
//@Log(operateType = OperateTypeEnum.ADD,operateDesc = "测试自定义日志")
public List<Demo> list(String name) {
OrganizationAssert.notNull(name, HrmI18nUtil.getI18nLabel(34721, "参数不能为空"));
List<Demo> demos = MapperProxyFactory.getProxy(DemoMapper.class).listAll();
////操作日志记录
//Method method = new Object() {
//}.getClass().getEnclosingMethod();
//LoggerContext loggerContext = LoggerContext.builder().operatorId(user.getUID()).operatorName(user.getLastname()).build();
//LogAspect logAspect = new LogAspect(DemoServiceImpl.class, method, loggerContext);
//logAspect.start();
return demos;
}
//这个是接口后置方法,大概的用法跟前置方法差不多,稍有差别
//注解名称为WeaReplaceAfter
//返回类型必须为String
//参数叫WeaAfterReplaceParam这个类前四个参数跟前置方法的那个相同不同的是多了一个叫data的String这个是那个接口执行完返回的报文
//@WeaReplaceAfter(value = "/api/bs/hrmorganization/scheme/updateForbiddenTagById",order = 1)
// public void after(WeaAfterReplaceParam weaAfterReplaceParam){
//
// String data = weaAfterReplaceParam.getData();//这个就是接口执行完的报文
// System.out.println(data);
// //日志记录
// }
}

@ -1,19 +0,0 @@
package com.engine.organization.service.impl;
import com.engine.organization.entity.po.Demo;
import com.engine.organization.service.TestService;
/**
* @Author weaver_cl
* @description:
* @Date 2022/4/28
* @Version V1.0
**/
//@WeaIocService
public class TestServiceImpl implements TestService {
@Override
public Demo list(String name) {
return Demo.builder().fid(1).build();
}
}

@ -1,66 +0,0 @@
package com.engine.organization.web;
import com.engine.common.util.ServiceUtil;
import com.engine.organization.entity.po.Demo;
import com.engine.organization.service.TestService;
import com.engine.organization.util.response.ReturnResult;
import com.engine.organization.wrapper.DemoWrapper;
import weaver.hrm.HrmUserVarify;
import weaver.hrm.User;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
/**
* @Author weaver_cl
* @description:
* @Date 2022/4/26
* @Version V1.0
**/
public class DemoController {
public DemoWrapper getDemoWrapper(User user){
return ServiceUtil.getService(DemoWrapper.class,user);
}
@GET
@Path("/test")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult testDemo(@Context HttpServletRequest request, @Context HttpServletResponse response,
@QueryParam("name") String name) {
try {
User user = HrmUserVarify.getUser(request, response);
return getDemoWrapper(user).testDemo(name);
}catch (Exception e) {
return ReturnResult.exceptionHandle(e);
}
}
/**
* 2 weaverboot 使
*/
//@WeaAutowired
private TestService testService;
@GET
@Path("/get")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult testGet(@Context HttpServletRequest request, @Context HttpServletResponse response,
@QueryParam("name") String name) {
try {
Demo list = testService.list(name);
return ReturnResult.successed(list);
}catch (Exception e) {
return ReturnResult.exceptionHandle(e);
}
}
}

@ -1,33 +0,0 @@
package com.engine.organization.wrapper;
import com.engine.common.util.ServiceUtil;
import com.engine.organization.annotation.Log;
import com.engine.organization.entity.po.Demo;
import com.engine.organization.enums.OperateTypeEnum;
import com.engine.organization.service.DemoService;
import com.engine.organization.service.impl.DemoServiceImpl;
import com.engine.organization.util.OrganizationWrapper;
import com.engine.organization.util.response.ReturnResult;
import weaver.hrm.User;
import java.util.List;
/**
* @Author weaver_cl
* @description:
* @Date 2022/4/26
* @Version V1.0
**/
public class DemoWrapper extends OrganizationWrapper {
private DemoService getDemoService(User user) {
return ServiceUtil.getService(DemoServiceImpl.class, user);
}
@Log(operateType = OperateTypeEnum.DELETE, operateDesc = "operateDesc")
public ReturnResult testDemo(String name) {
List<Demo> list = getDemoService(user).list(name);
//writeOperateLog(new Object(){}.getClass(), "记录testDemo操作日志");
return ReturnResult.successed(list);
}
}
Loading…
Cancel
Save