Skip to content

T
tianjin-cement
Commit c86a51f8 authored by mengbali153's avatar mengbali153
Browse files
Options

非标产值申请

parent 1353e7af
Show whitespace changes
Inline Side-by-side
Showing with 95 additions and 28 deletions
cement-business/src/main/java/cn/wise/sc/cement/business/controller/NonStandardValueController.java
View file @ c86a51f8
......@@ -6,6 +6,8 @@ import cn.hutool.core.util.StrUtil;
import cn.wise.sc.cement.business.entity.NonStandardValue;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.vo.NonStandardApplyVo;
import cn.wise.sc.cement.business.model.vo.NonStandardValueVo;
import cn.wise.sc.cement.business.service.INonStandardValueService;
import cn.wise.sc.cement.business.util.PageUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -14,10 +16,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import javax.xml.crypto.Data;
......@@ -92,6 +91,21 @@ public class NonStandardValueController {
return BaseResponse.errorMsg("失败!");
}
// @ApiOperation(value = "根据用户id查询指定非标产值信息")
// @GetMapping("/{userId}")
// public BaseResponse getByUserId(@PathVariable Integer userId) {
// try {
// BaseResponse<List<NonStandardValueVo>> e = inonStandardValueService.getByUserId(userId);
// if (e == null) {
// return BaseResponse.errorMsg("信息错误!");
// }
// return BaseResponse.okData(e);
// } catch (Exception e) {
// log.debug("通过用户id查询非标产值信息{}", e);
// }
// return BaseResponse.errorMsg("失败!");
// }
@ApiOperation("非标产值信息导出列表")
@PostMapping("/exportList")
public void exportList(String filename, Integer userId, String name, HttpServletResponse response) {
......
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/NonStandardValueMapper.java
View file @ c86a51f8
......@@ -24,4 +24,6 @@ public interface NonStandardValueMapper extends BaseMapper<NonStandardValue> {
List<Map<String, Object>> exportList(@Param("params") Map<String, Object> params);
List<NonStandardValueVo> getList(@Param("params") Map<String, Object> params);
//
// List<NonStandardValueVo> getByUserId(@Param("params") Map<String, Object> params);
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/NonStandardValueMapper.xml
View file @ c86a51f8
......@@ -44,6 +44,16 @@
order by na.id asc
</select>
<!-- <select id="getByUserId" resultType="cn.wise.sc.cement.business.model.vo.NonStandardValueVo">-->
<!-- select na.*,su.name as name,su.username as account,na.start_time as startTime,su.group_id as groups,sg.name as-->
<!-- groupname-->
<!-- from nonstandard_apply na-->
<!-- LEFT JOIN sys_user su ON su.id = na.user_id-->
<!-- LEFT JOIN sys_group sg ON sg.id = su.group_id-->
<!-- <include refid="where"/>-->
<!-- order by na.id asc-->
<!-- </select>-->
<select id="exportList" resultType="java.util.HashMap">
SELECT
na.id as 序号,
......
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/NonStandardApplyQuery.java
View file @ c86a51f8
......@@ -36,6 +36,6 @@ public class NonStandardApplyQuery {
@ApiModelProperty(name = "workDescription", value = "工作描述")
private String workDescription;
@ApiModelProperty(name = "userId", value = "用户id")
private Integer userId;
/* @ApiModelProperty(name = "userId", value = "用户id")
private Integer userId;*/
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/INonStandardValueService.java
View file @ c86a51f8
......@@ -3,6 +3,7 @@ package cn.wise.sc.cement.business.service;
import cn.wise.sc.cement.business.entity.NonStandardValue;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.vo.NonStandardApplyVo;
import cn.wise.sc.cement.business.model.vo.NonStandardValueVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
......@@ -35,6 +36,13 @@ public interface INonStandardValueService extends IService<NonStandardValue> {
//计算每个用户提交的非标产值
BaseResponse<List<NonStandardValue>> nonValue(Date start, Date end, Integer groups);
// /**
// * 通过用户id查询非标产值信息
// *
// * @return List
// */
// BaseResponse<List<NonStandardValueVo>> getByUserId(Integer userId);
/**
* 获取所有非标产值信息
*
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardApplyServiceImpl.java
View file @ c86a51f8
......@@ -4,11 +4,13 @@ import cn.wise.sc.cement.business.entity.NonStandardApply;
import cn.wise.sc.cement.business.entity.NonStandardApproval;
import cn.wise.sc.cement.business.mapper.NonStandardApplyMapper;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.LoginUser;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.NonStandardApplyQuery;
import cn.wise.sc.cement.business.model.vo.NonStandardApplyVo;
import cn.wise.sc.cement.business.model.vo.NonStandardValueVo;
import cn.wise.sc.cement.business.service.INonStandardApplyService;
import cn.wise.sc.cement.business.service.ISysUserService;
import cn.wise.sc.cement.business.util.ExcelUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
......@@ -17,6 +19,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.swagger.models.auth.In;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -41,6 +44,8 @@ import java.util.Map;
public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMapper, NonStandardApply> implements INonStandardApplyService {
@Resource
private NonStandardApplyMapper nonStandardApplyMapper;
@Autowired
private ISysUserService userService;
@Override
public BaseResponse<IPage<NonStandardApplyVo>> getPage(PageQuery pageQuery, String name,Integer userId) {
......@@ -68,12 +73,18 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
return BaseResponse.okData(list);
}
@Override
@Transactional
public BaseResponse<NonStandardApply> create(NonStandardApplyQuery query) {
LoginUser loginUser = userService.getLoginUser();
if(loginUser==null){
return BaseResponse.errorMsg("请登录账号");
}
NonStandardApply cama = new NonStandardApply();
BeanUtils.copyProperties(query, cama);
cama.setStatistical(cama.getStartTime() + "/" + cama.getEndTime());
cama.setUserId(loginUser.getId());
nonStandardApplyMapper.insert(cama);
return BaseResponse.okData(cama);
}
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardValueServiceImpl.java
View file @ c86a51f8
......@@ -4,6 +4,7 @@ import cn.wise.sc.cement.business.entity.NonStandardValue;
import cn.wise.sc.cement.business.mapper.NonStandardValueMapper;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.vo.NonStandardApplyVo;
import cn.wise.sc.cement.business.model.vo.NonStandardValueVo;
import cn.wise.sc.cement.business.service.INonStandardValueService;
import cn.wise.sc.cement.business.util.ExcelUtil;
......@@ -42,6 +43,19 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
return BaseResponse.okData(pages);
}
// public BaseResponse<List<NonStandardValue>> userValue(Date start, Date end,Integer userId){
// List<NonStandardValueVo> data = getList(start, end, userId).getData();
// List<NonStandardValue> rts = new ArrayList<>();
// NonStandardValue finalNonStandardValue = new NonStandardValue();
// finalNonStandardValue.setFinalValue(0D);
// for (NonStandardValueVo nonStandardValueVo:data){
// Double newFinalValue = nonStandardValueVo.getFinalValue() + finalNonStandardValue.getFinalValue();
// finalNonStandardValue.setFinalValue(newFinalValue);
// }
// rts.add(finalNonStandardValue);
// return BaseResponse.okData(rts);
// }
@Override
//计算每个用户提交的非标产值
public BaseResponse<List<NonStandardValue>> nonValue(Date start, Date end, Integer groups) {
......@@ -105,6 +119,14 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
return BaseResponse.okData(rts);
}
// @Override
// public BaseResponse<List<NonStandardValueVo>> getByUserId(Integer userId) {
// Map<String, Object> params = new HashMap<>();
// params.put("userId", userId);
// List<NonStandardValueVo> list = nonStandardValueMapper.getByUserId(params);
// return BaseResponse.okData(list);
// }
@Override
public BaseResponse<List<NonStandardValueVo>> getList(Date start, Date end, Integer groups) {
Map<String, Object> params = new HashMap<>();
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/WeiXinService.java
View file @ c86a51f8
......@@ -47,27 +47,27 @@ public class WeiXinService {
System.out.println("==================code===================");
System.out.println(code);
try {
String accessToken = null;
if (type.equals("PC")) {
accessToken = getAccessToken();
} else if (type.equals("APP")) {
accessToken = getPCAccessToken();
} else {
return BaseResponse.errorMsg("参数错误");
}
String param = "access_token=%s&code=%s";
param = String.format(param, accessToken, code);
JSONObject jsonObject = WeixinInterfaceUtil.doGet(Global.USERINFOURL, param);
if (jsonObject.get("errcode").toString().equals("40029")) {
return BaseResponse.errorMsg("code失效!");
}
String UserId = jsonObject.getString("UserId");
System.out.println("==================UserId===================");
System.out.println(UserId);
JSONObject userJson = getUser(accessToken, UserId);
// String accessToken = null;
// if (type.equals("PC")) {
// accessToken = getAccessToken();
// } else if (type.equals("APP")) {
// accessToken = getPCAccessToken();
// } else {
// return BaseResponse.errorMsg("参数错误");
// }
// String param = "access_token=%s&code=%s";
// param = String.format(param, accessToken, code);
// JSONObject jsonObject = WeixinInterfaceUtil.doGet(Global.USERINFOURL, param);
// if (jsonObject.get("errcode").toString().equals("40029")) {
// return BaseResponse.errorMsg("code失效!");
// }
// String UserId = jsonObject.getString("UserId");
// System.out.println("==================UserId===================");
// System.out.println(UserId);
// JSONObject userJson = getUser(accessToken, UserId);
QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
wrapper.eq("phone", userJson.get("mobile"));
// wrapper.eq("phone", code); //暂时用手机号代替code
// wrapper.eq("phone", userJson.get("mobile"));
wrapper.eq("phone", code); //暂时用手机号代替code
SysUser sysUser = userService.getOne(wrapper);
if (sysUser == null) {
return BaseResponse.errorMsg("非系统用户不允许登录!");
......@@ -83,8 +83,8 @@ public class WeiXinService {
sysUser.getName(), sysUser.getPhone());
System.out.println(token);
redisUtil.setString(sysUser.getId().toString(), token, 3600);
sysUser.setWxId(UserId);
userService.updateById(sysUser);
// sysUser.setWxId(UserId);
// userService.updateById(sysUser);
return BaseResponse.okData(token);
} catch (Exception e) {
return BaseResponse.errorMsg(e.getMessage());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment