1.监督计划功能调整
2.全过程功能调整
This commit is contained in:
@@ -1,30 +1,26 @@
|
||||
package com.njcn.process.utils;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonGenerator;
|
||||
import com.fasterxml.jackson.databind.SerializerProvider;
|
||||
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
|
||||
import com.alibaba.fastjson.serializer.JSONSerializer;
|
||||
import com.alibaba.fastjson.serializer.ObjectSerializer;
|
||||
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.lang.reflect.Type;
|
||||
import java.sql.Timestamp;
|
||||
|
||||
@Component
|
||||
public class TimestampAsLongSerializer extends StdSerializer<Timestamp> {
|
||||
|
||||
protected TimestampAsLongSerializer(Class<Timestamp> t) {
|
||||
super(t);
|
||||
}
|
||||
public TimestampAsLongSerializer() {
|
||||
this(null);
|
||||
}
|
||||
|
||||
public class TimestampAsLongSerializer implements ObjectSerializer {
|
||||
|
||||
@Override
|
||||
public void serialize(Timestamp value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
|
||||
if (value != null) {
|
||||
gen.writeNumber(value.getTime());
|
||||
public void write(JSONSerializer serializer, Object object, Object fieldName, Type fieldType, int features) throws IOException {
|
||||
if (object instanceof Timestamp) {
|
||||
Timestamp timestamp = (Timestamp) object;
|
||||
// 将Timestamp转换为时间戳(毫秒数)
|
||||
long time = timestamp.getTime();
|
||||
serializer.write(time);
|
||||
} else {
|
||||
gen.writeNull();
|
||||
serializer.write(object);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
FROM openjdk:8-jdk-alpine
|
||||
ADD target/processboot.jar processboot.jar
|
||||
ENTRYPOINT ["java","-jar","/processboot.jar"]
|
||||
ENTRYPOINT ["/bin/sh", "-c" , "echo 25.36.214.50 dwzyywzt-pms3-proxy.com >> /etc/hosts && echo 25.36.227.20 pms.pms30.com.cn >> /etc/hosts && echo 25.36.181.69 8d051549520e423ab8dccf8b3d457c74.apigw.he-region-2.sgic.sgcc.com.cn >> /etc/hosts && exec java -jar processboot.jar" ]
|
||||
EXPOSE 10222
|
||||
RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone
|
||||
|
||||
@@ -21,4 +21,6 @@ public interface SupvFileMapper extends BaseMapper<SupvFile> {
|
||||
List<SupvFile> selectPlanFile(@Param("param") SupvFileParam param);
|
||||
|
||||
List<SupvFile> selecProblemtFile(@Param("param") SupvFileParam param);
|
||||
|
||||
List<SupvFile> selectSimpleFile(@Param("param") SupvFileParam param);
|
||||
}
|
||||
|
||||
@@ -47,4 +47,25 @@
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectSimpleFile" resultType="com.njcn.process.pojo.po.SupvFile">
|
||||
select
|
||||
sf.*
|
||||
from
|
||||
supv_file sf
|
||||
<where>
|
||||
<if test="param!=null and param.ids != null and param.ids.size > 0">
|
||||
AND busi_Id IN
|
||||
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="param!=null and param.type != null ">
|
||||
AND sf.type = #{param.type}
|
||||
</if>
|
||||
<if test="param!=null and param.attachmentType != null and param.attachmentType != ''">
|
||||
AND sf.attachment_Type = #{param.attachmentType}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -91,8 +91,12 @@ public class SupvFileServiceImpl extends ServiceImpl<SupvFileMapper, SupvFile> i
|
||||
public List<SupvFile> listFile(SupvFileParam param) {
|
||||
if (param.getType()==0){
|
||||
return this.baseMapper.selectPlanFile(param);
|
||||
}else if(param.getType()==1){
|
||||
return this.baseMapper.selecProblemtFile(param);
|
||||
}else {
|
||||
return this.baseMapper.selectSimpleFile(param);
|
||||
}
|
||||
return this.baseMapper.selecProblemtFile(param);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user